diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index e9906b8f04..c0391813da 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,9 +27,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.8.0" - const val openosrsVersion = "4.14.0" + const val openosrsVersion = "4.15.0" - const val rsversion = 200 + const val rsversion = 201 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java index 37fb27fc24..d9cf5c1665 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java @@ -49,16 +49,16 @@ public class ItemClient public ItemPrice[] getPrices() throws IOException { HttpUrl.Builder urlBuilder = RuneLiteAPI.getApiBase().newBuilder() - .addPathSegment("item") - .addPathSegment("prices.js"); + .addPathSegment("item") + .addPathSegment("prices.js"); HttpUrl url = urlBuilder.build(); log.debug("Built URI: {}", url); Request request = new Request.Builder() - .url(url) - .build(); + .url(url) + .build(); try (Response response = client.newCall(request).execute()) { @@ -80,17 +80,17 @@ public class ItemClient public Map getStats() throws IOException { HttpUrl.Builder urlBuilder = RuneLiteAPI.getStaticBase().newBuilder() - .addPathSegment("item") - // TODO: Change this to stats.min.json later after release is undeployed - .addPathSegment("stats.ids.min.json"); + .addPathSegment("item") + // TODO: Change this to stats.min.json later after release is undeployed + .addPathSegment("stats.ids.min.json"); HttpUrl url = urlBuilder.build(); log.debug("Built URI: {}", url); Request request = new Request.Builder() - .url(url) - .build(); + .url(url) + .build(); try (Response response = client.newCall(request).execute()) { diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java b/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java index 5b86dd336d..ab79a525bb 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java @@ -51,27 +51,27 @@ public class ItemStats if (other.equipment != null) { final ItemEquipmentStats equipment = this.equipment != null - ? this.equipment - : new ItemEquipmentStats.ItemEquipmentStatsBuilder().build(); + ? this.equipment + : new ItemEquipmentStats.ItemEquipmentStatsBuilder().build(); newEquipment = new ItemEquipmentStats.ItemEquipmentStatsBuilder() - .slot(equipment.getSlot()) - .astab(equipment.getAstab() - other.equipment.getAstab()) - .aslash(equipment.getAslash() - other.equipment.getAslash()) - .acrush(equipment.getAcrush() - other.equipment.getAcrush()) - .amagic(equipment.getAmagic() - other.equipment.getAmagic()) - .arange(equipment.getArange() - other.equipment.getArange()) - .dstab(equipment.getDstab() - other.equipment.getDstab()) - .dslash(equipment.getDslash() - other.equipment.getDslash()) - .dcrush(equipment.getDcrush() - other.equipment.getDcrush()) - .dmagic(equipment.getDmagic() - other.equipment.getDmagic()) - .drange(equipment.getDrange() - other.equipment.getDrange()) - .str(equipment.getStr() - other.equipment.getStr()) - .rstr(equipment.getRstr() - other.equipment.getRstr()) - .mdmg(equipment.getMdmg() - other.equipment.getMdmg()) - .prayer(equipment.getPrayer() - other.equipment.getPrayer()) - .aspeed(equipment.getAspeed() - other.equipment.getAspeed()) - .build(); + .slot(equipment.getSlot()) + .astab(equipment.getAstab() - other.equipment.getAstab()) + .aslash(equipment.getAslash() - other.equipment.getAslash()) + .acrush(equipment.getAcrush() - other.equipment.getAcrush()) + .amagic(equipment.getAmagic() - other.equipment.getAmagic()) + .arange(equipment.getArange() - other.equipment.getArange()) + .dstab(equipment.getDstab() - other.equipment.getDstab()) + .dslash(equipment.getDslash() - other.equipment.getDslash()) + .dcrush(equipment.getDcrush() - other.equipment.getDcrush()) + .dmagic(equipment.getDmagic() - other.equipment.getDmagic()) + .drange(equipment.getDrange() - other.equipment.getDrange()) + .str(equipment.getStr() - other.equipment.getStr()) + .rstr(equipment.getRstr() - other.equipment.getRstr()) + .mdmg(equipment.getMdmg() - other.equipment.getMdmg()) + .prayer(equipment.getPrayer() - other.equipment.getPrayer()) + .aspeed(equipment.getAspeed() - other.equipment.getAspeed()) + .build(); } else { diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index f65e50571d..0002a60a69 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,188 +4,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("ko") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = -1025807137 - ) - static int field3712; - @ObfuscatedName("d") + @ObfuscatedName("qf") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Llz;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lpd;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1076912287 + intValue = 967246027 ) - static int field3706; - @ObfuscatedName("v") + static int field3702; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1664464817 + intValue = -272070621 ) @Export("groupCount") int groupCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("groupIds") int[] groupIds; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpp;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lpz;" + descriptor = "[Lpp;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("groups") Object[] groups; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("files") Object[][] files; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 690616525 + intValue = -557696457 ) @Export("hash") public int hash; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("shallowFiles") boolean shallowFiles; static { - gzipDecompressor = new GZipDecompressor(); - field3706 = 0; + gzipDecompressor = new GZipDecompressor(); // L: 23 + field3702 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; - this.shallowFiles = var2; - } + this.releaseGroups = var1; // L: 32 + this.shallowFiles = var2; // L: 33 + } // L: 34 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "30" + descriptor = "(II)V", + garbageValue = "297974277" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - } + } // L: 118 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "120" + garbageValue = "23" ) @Export("loadGroup") void loadGroup(int var1) { - } + } // L: 204 - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "0" + garbageValue = "14" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; + return this.groups[var1] != null ? 100 : 0; // L: 174 175 } - @ObfuscatedName("aj") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "18" + descriptor = "([BI)V", + garbageValue = "482099677" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = LoginScreenAnimation.method2192(var1, var1.length); - Buffer var2 = new Buffer(class12.decompressBytes(var1)); - int var3 = var2.readUnsignedByte(); - if (var3 >= 5 && var3 <= 7) { - if (var3 >= 6) { - var2.readInt(); + this.hash = NPC.method2256(var1, var1.length); // L: 37 + Buffer var2 = new Buffer(ByteArrayPool.decompressBytes(var1)); // L: 38 + int var3 = var2.readUnsignedByte(); // L: 39 + if (var3 >= 5 && var3 <= 7) { // L: 40 + if (var3 >= 6) { // L: 41 + var2.readInt(); // L: 42 } - int var4 = var2.readUnsignedByte(); - if (var3 >= 7) { - this.groupCount = var2.method6912(); + int var4 = var2.readUnsignedByte(); // L: 45 + if (var3 >= 7) { // L: 46 + this.groupCount = var2.method6982(); } else { - this.groupCount = var2.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); // L: 47 } - int var5 = 0; - int var6 = -1; - this.groupIds = new int[this.groupCount]; + int var5 = 0; // L: 48 + int var6 = -1; // L: 49 + this.groupIds = new int[this.groupCount]; // L: 50 int var7; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method6912(); - if (this.groupIds[var7] > var6) { + if (var3 >= 7) { // L: 51 + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52 + this.groupIds[var7] = var5 += var2.method6982(); // L: 53 + if (this.groupIds[var7] > var6) { // L: 54 var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.readUnsignedShort(); - if (this.groupIds[var7] > var6) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58 + this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59 + if (this.groupIds[var7] > var6) { // L: 60 var6 = this.groupIds[var7]; } } } - this.groupCrcs = new int[var6 + 1]; - this.groupVersions = new int[var6 + 1]; - this.fileCounts = new int[var6 + 1]; - this.fileIds = new int[var6 + 1][]; - this.groups = new Object[var6 + 1]; - this.files = new Object[var6 + 1][]; - if (var4 != 0) { - this.groupNameHashes = new int[var6 + 1]; + this.groupCrcs = new int[var6 + 1]; // L: 63 + this.groupVersions = new int[var6 + 1]; // L: 64 + this.fileCounts = new int[var6 + 1]; // L: 65 + this.fileIds = new int[var6 + 1][]; // L: 66 + this.groups = new Object[var6 + 1]; // L: 67 + this.files = new Object[var6 + 1][]; // L: 68 + if (var4 != 0) { // L: 69 + this.groupNameHashes = new int[var6 + 1]; // L: 70 - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71 this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72 } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74 this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75 this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76 this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } @@ -194,533 +195,536 @@ public abstract class AbstractArchive { int var10; int var11; int var12; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + if (var3 >= 7) { // L: 77 + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78 + var8 = this.groupIds[var7]; // L: 79 + var9 = this.fileCounts[var8]; // L: 80 + var5 = 0; // L: 81 + var10 = -1; // L: 82 + this.fileIds[var8] = new int[var9]; // L: 83 - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method6912(); - if (var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { // L: 84 + var12 = this.fileIds[var8][var11] = var5 += var2.method6982(); // L: 85 + if (var12 > var10) { // L: 86 var10 = var12; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; // L: 88 } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92 + var8 = this.groupIds[var7]; // L: 93 + var9 = this.fileCounts[var8]; // L: 94 + var5 = 0; // L: 95 + var10 = -1; // L: 96 + this.fileIds[var8] = new int[var9]; // L: 97 - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); - if (var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { // L: 98 + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99 + if (var12 > var10) { // L: 100 var10 = var12; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; // L: 102 } } - if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; - this.fileNameHashTables = new IntHashTable[var6 + 1]; + if (var4 != 0) { // L: 105 + this.fileNameHashes = new int[var6 + 1][]; // L: 106 + this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108 + var8 = this.groupIds[var7]; // L: 109 + var9 = this.fileCounts[var8]; // L: 110 + this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111 - for (var10 = 0; var10 < var9; ++var10) { + for (var10 = 0; var10 < var9; ++var10) { // L: 112 this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113 } } } else { throw new RuntimeException(""); } - } + } // L: 116 - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "1532243849" + garbageValue = "-1781760739" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II[IB)[B", - garbageValue = "1" + descriptor = "(II[II)[B", + garbageValue = "1620324813" ) @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) { - if (this.files[var1][var2] == null) { - boolean var4 = this.buildFiles(var1, var3); - if (!var4) { - this.loadGroup(var1); - var4 = this.buildFiles(var1, var3); - if (!var4) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 + if (this.files[var1][var2] == null) { // L: 126 + boolean var4 = this.buildFiles(var1, var3); // L: 127 + if (!var4) { // L: 128 + this.loadGroup(var1); // L: 129 + var4 = this.buildFiles(var1, var3); // L: 130 + if (!var4) { // L: 131 return null; } } } - byte[] var5 = class196.method3888(this.files[var1][var2], false); + byte[] var5 = ChatChannel.method2013(this.files[var1][var2], false); // L: 134 if (this.shallowFiles) { - this.files[var1][var2] = null; + this.files[var1][var2] = null; // L: 135 } - return var5; + return var5; // L: 136 } else { return null; } } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1877485054" + descriptor = "(IIB)Z", + garbageValue = "69" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140 if (this.files[var1][var2] != null) { - return true; - } else if (this.groups[var1] != null) { + return true; // L: 141 + } else if (this.groups[var1] != null) { // L: 142 return true; } else { - this.loadGroup(var1); - return this.groups[var1] != null; + this.loadGroup(var1); // L: 143 + return this.groups[var1] != null; // L: 144 } } else { - return false; + return false; // L: 145 } } - @ObfuscatedName("ae") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1656310918" + garbageValue = "698545747" ) - public boolean method5223(int var1) { - if (this.files.length == 1) { + public boolean method5359(int var1) { + if (this.files.length == 1) { // L: 149 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); + return this.tryLoadFile(var1, 0); // L: 150 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 151 } } - @ObfuscatedName("ai") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-790601931" + garbageValue = "-1744461106" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { + if (this.groups[var1] != null) { // L: 155 return true; } else { - this.loadGroup(var1); - return this.groups[var1] != null; + this.loadGroup(var1); // L: 156 + return this.groups[var1] != null; // L: 157 } } - @ObfuscatedName("bg") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" + descriptor = "(S)Z", + garbageValue = "-5079" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; + boolean var1 = true; // L: 162 - 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) { + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163 + int var3 = this.groupIds[var2]; // L: 164 + if (this.groups[var3] == null) { // L: 165 + this.loadGroup(var3); // L: 166 + if (this.groups[var3] == null) { // L: 167 var1 = false; } } } - return var1; + return var1; // L: 170 } - @ObfuscatedName("bf") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1576564165" + descriptor = "(IB)[B", + garbageValue = "0" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { + if (this.files.length == 1) { // L: 179 return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); + return this.takeFile(var1, 0); // L: 180 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 181 } } - @ObfuscatedName("bj") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-1431329812" + garbageValue = "2111917178" ) @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) { - 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) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 + if (this.files[var1][var2] == null) { // L: 186 + boolean var3 = this.buildFiles(var1, (int[])null); // L: 187 + if (!var3) { // L: 188 + this.loadGroup(var1); // L: 189 + var3 = this.buildFiles(var1, (int[])null); // L: 190 + if (!var3) { // L: 191 return null; } } } - byte[] var4 = class196.method3888(this.files[var1][var2], false); - return var4; + byte[] var4 = ChatChannel.method2013(this.files[var1][var2], false); // L: 194 + return var4; // L: 195 } else { return null; } } - @ObfuscatedName("bo") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "569616602" + garbageValue = "407164309" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { + if (this.files.length == 1) { // L: 199 return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); + return this.getFile(var1, 0); // L: 200 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 201 } } + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IB)[I", + garbageValue = "-18" + ) + @Export("getGroupFileIds") + public int[] getGroupFileIds(int var1) { + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "33" + ) + @Export("getGroupFileCount") + public int getGroupFileCount(int var1) { + return this.files[var1].length; // L: 214 + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1225769356" + ) + @Export("getGroupCount") + public int getGroupCount() { + return this.files.length; // L: 218 + } + @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(II)[I", - garbageValue = "46587158" - ) - @Export("getGroupFileIds") - public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "677840140" - ) - @Export("getGroupFileCount") - public int getGroupFileCount(int var1) { - return this.files[var1].length; - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" - ) - @Export("getGroupCount") - public int getGroupCount() { - return this.files.length; - } - - @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1397286870" + garbageValue = "30287775" ) @Export("clearGroups") public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 this.groups[var1] = null; } - } + } // L: 223 - @ObfuscatedName("bm") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1543674565" + descriptor = "(IB)V", + garbageValue = "39" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 this.files[var1][var2] = null; } - } + } // L: 227 - @ObfuscatedName("bv") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1464897629" + garbageValue = "-1612581115" ) @Export("clearFiles") public void clearFiles() { - for (int var1 = 0; var1 < this.files.length; ++var1) { - if (this.files[var1] != null) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 + if (this.files[var1] != null) { // L: 231 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232 this.files[var1][var2] = null; } } } - } + } // L: 235 - @ObfuscatedName("bs") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I[IS)Z", - garbageValue = "-22593" + descriptor = "(I[IB)Z", + garbageValue = "63" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { + if (this.groups[var1] == null) { // L: 238 return false; } else { - int var3 = this.fileCounts[var1]; - int[] var4 = this.fileIds[var1]; - Object[] var5 = this.files[var1]; - boolean var6 = true; + int var3 = this.fileCounts[var1]; // L: 239 + int[] var4 = this.fileIds[var1]; // L: 240 + Object[] var5 = this.files[var1]; // L: 241 + boolean var6 = true; // L: 242 - for (int var7 = 0; var7 < var3; ++var7) { - if (var5[var4[var7]] == null) { - var6 = false; + for (int var7 = 0; var7 < var3; ++var7) { // L: 243 + if (var5[var4[var7]] == null) { // L: 244 + var6 = false; // L: 245 break; } } - if (var6) { + if (var6) { // L: 249 return true; } else { byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = class196.method3888(this.groups[var1], false); + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 + var21 = ChatChannel.method2013(this.groups[var1], false); // L: 256 } else { - var21 = class196.method3888(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); + var21 = ChatChannel.method2013(this.groups[var1], true); // L: 252 + Buffer var8 = new Buffer(var21); // L: 253 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 } - byte[] var24 = class12.decompressBytes(var21); - if (this.releaseGroups) { + byte[] var25 = ByteArrayPool.decompressBytes(var21); // L: 259 + if (this.releaseGroups) { // L: 264 this.groups[var1] = null; } - if (var3 > 1) { - int var9 = var24.length; - --var9; - int var10 = var24[var9] & 255; - var9 -= var3 * var10 * 4; - Buffer var11 = new Buffer(var24); - int[] var12 = new int[var3]; - var11.offset = var9; + int var10; + if (var3 > 1) { // L: 265 + int var22 = var25.length; // L: 266 + --var22; // L: 267 + var10 = var25[var22] & 255; + var22 -= var10 * var3 * 4; // L: 268 + Buffer var11 = new Buffer(var25); // L: 269 + int[] var12 = new int[var3]; // L: 270 + var11.offset = var22; // L: 271 int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { - var14 = 0; + for (int var13 = 0; var13 < var10; ++var13) { // L: 272 + var14 = 0; // L: 273 - for (var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; + for (var15 = 0; var15 < var3; ++var15) { // L: 274 + var14 += var11.readInt(); // L: 275 + var12[var15] += var14; // L: 276 } } - byte[][] var22 = new byte[var3][]; + byte[][] var23 = new byte[var3][]; // L: 279 - for (var14 = 0; var14 < var3; ++var14) { - var22[var14] = new byte[var12[var14]]; - var12[var14] = 0; + for (var14 = 0; var14 < var3; ++var14) { // L: 280 + var23[var14] = new byte[var12[var14]]; // L: 281 + var12[var14] = 0; // L: 282 } - var11.offset = var9; - var14 = 0; + var11.offset = var22; // L: 284 + var14 = 0; // L: 285 int var17; - for (var15 = 0; var15 < var10; ++var15) { - int var23 = 0; + for (var15 = 0; var15 < var10; ++var15) { // L: 286 + int var24 = 0; // L: 287 - for (var17 = 0; var17 < var3; ++var17) { - var23 += var11.readInt(); - System.arraycopy(var24, var14, var22[var17], var12[var17], var23); - var12[var17] += var23; - var14 += var23; + for (var17 = 0; var17 < var3; ++var17) { // L: 288 + var24 += var11.readInt(); // L: 289 + System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 290 + var12[var17] += var24; // L: 291 + var14 += var24; // L: 292 } } - for (var15 = 0; var15 < var3; ++var15) { - if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var22[var15]; + for (var15 = 0; var15 < var3; ++var15) { // L: 295 + if (!this.shallowFiles) { // L: 296 + var17 = var4[var15]; // L: 298 + byte[] var19 = var23[var15]; // L: 300 Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; + if (var19 == null) { // L: 302 + var18 = null; // L: 303 + } else if (var19.length > 136) { // L: 306 + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 308 + var20.set(var19); // L: 309 + var18 = var20; // L: 310 } else { - var18 = var19; + var18 = var19; // L: 315 } - var5[var17] = var18; + var5[var17] = var18; // L: 317 } else { - var5[var4[var15]] = var22[var15]; + var5[var4[var15]] = var23[var15]; // L: 319 } } - } else if (!this.shallowFiles) { - var5[var4[0]] = DevicePcmPlayerProvider.method372(var24, false); + } else if (!this.shallowFiles) { // L: 323 + var10 = var4[0]; // L: 325 + Object var26; + if (var25 == null) { // L: 328 + var26 = null; // L: 329 + } else if (var25.length > 136) { // L: 332 + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 334 + var27.set(var25); // L: 335 + var26 = var27; // L: 336 + } else { + var26 = var25; // L: 341 + } + + var5[var10] = var26; // L: 343 } else { - var5[var4[0]] = var24; + var5[var4[0]] = var25; // L: 345 } - return true; + return true; // L: 347 } } } - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2136514037" - ) - @Export("getGroupId") - public int getGroupId(String var1) { - var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(UserComparator4.hashString(var1)); - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "-96" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(UserComparator4.hashString(var2)); - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "375509554" - ) - @Export("isValidFileName") - public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - if (var3 < 0) { - return false; - } else { - int var4 = this.fileNameHashTables[var3].get(UserComparator4.hashString(var2)); - return var4 >= 0; - } - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "1943332818" - ) - @Export("takeFileByNames") - public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(UserComparator4.hashString(var2)); - return this.takeFile(var3, var4); - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "263767058" - ) - @Export("tryLoadFileByNames") - public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(UserComparator4.hashString(var2)); - return this.tryLoadFile(var3, var4); - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "46" - ) - @Export("tryLoadGroupByName") - public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - return this.tryLoadGroup(var2); - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1412228051" - ) - @Export("loadRegionFromName") - public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - if (var2 >= 0) { - this.loadRegionFromGroup(var2); - } - } - @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "507310296" + garbageValue = "-337873165" + ) + @Export("getGroupId") + public int getGroupId(String var1) { + var1 = var1.toLowerCase(); // L: 351 + return this.groupNameHashTable.get(class157.hashString(var1)); // L: 352 + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "-28" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); // L: 356 + return this.fileNameHashTables[var1].get(class157.hashString(var2)); // L: 357 + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "1454790429" + ) + @Export("isValidFileName") + public boolean isValidFileName(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 361 + var2 = var2.toLowerCase(); // L: 362 + int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 363 + if (var3 < 0) { // L: 364 + return false; + } else { + int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 365 + return var4 >= 0; // L: 366 + } + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B", + garbageValue = "-103" + ) + @Export("takeFileByNames") + public byte[] takeFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 371 + var2 = var2.toLowerCase(); // L: 372 + int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 373 + int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 374 + return this.takeFile(var3, var4); // L: 375 + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "-1438586602" + ) + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 379 + var2 = var2.toLowerCase(); // L: 380 + int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 381 + int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 382 + return this.tryLoadFile(var3, var4); // L: 383 + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "95468042" + ) + @Export("tryLoadGroupByName") + public boolean tryLoadGroupByName(String var1) { + var1 = var1.toLowerCase(); // L: 387 + int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 388 + return this.tryLoadGroup(var2); // L: 389 + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2011859328" + ) + @Export("loadRegionFromName") + public void loadRegionFromName(String var1) { + var1 = var1.toLowerCase(); // L: 393 + int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 394 + if (var2 >= 0) { // L: 395 + this.loadRegionFromGroup(var2); // L: 396 + } + } // L: 397 + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1472948344" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(UserComparator4.hashString(var1)); - return this.groupLoadPercent(var2); - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" - ) - static final void method5325() { - Client.field687 = Client.cycleCntr; - KitDefinition.field1665 = true; + var1 = var1.toLowerCase(); // L: 400 + int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 401 + return this.groupLoadPercent(var2); // L: 402 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 7402678950..7f5618e9c1 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,153 +1,122 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("jr") +@ObfuscatedName("jt") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1268577977 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - AbstractByteArrayCopier() { - } + } // L: 4 - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)[B", - garbageValue = "-25" + garbageValue = "99" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "944891137" + descriptor = "([BB)V", + garbageValue = "-48" ) @Export("set") public abstract void set(byte[] var1); - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-459994654" + descriptor = "(Lkd;IIIBZS)V", + garbageValue = "-20064" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = UserComparator7.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = UserComparator7.loadClassFromDescriptor(var20); - if (UserComparator7.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = UserComparator7.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 108 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 109 + if (var8 == null) { // L: 110 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 111 + if (var8 == null) { // L: 112 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 113 + if (var8 != null) { // L: 114 + if (var5) { // L: 115 + var8.removeDual(); // L: 116 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 117 + --NetCache.NetCache_pendingWritesCount; // L: 118 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 119 } + } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); + if (!var5) { // L: 123 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 124 + if (var8 != null) { // L: 125 + return; + } } - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (UserComparator7.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); + var8 = new NetFileRequest(); // L: 127 + var8.archive = var0; // L: 128 + var8.crc = var3; // L: 129 + var8.padding = var4; // L: 130 + if (var5) { // L: 131 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 132 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 133 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 136 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 137 + ++NetCache.NetCache_pendingWritesCount; // L: 138 } - var2.fields[var3] = Reflection.findField(UserComparator7.loadClassFromDescriptor(var5), var6); } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; + } + } + } // L: 121 140 + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "1" + ) + static void method5169(int var0, String var1) { + int var2 = Players.Players_count; // L: 9075 + int[] var3 = Players.Players_indices; // L: 9076 + boolean var4 = false; // L: 9077 + Username var5 = new Username(var1, GrandExchangeOfferUnitPriceComparator.loginType); // L: 9078 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 9079 + Player var7 = Client.players[var3[var6]]; // L: 9080 + if (var7 != null && var7 != HealthBarDefinition.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9081 + PacketBufferNode var8; + if (var0 == 1) { // L: 9082 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); // L: 9084 + var8.packetBuffer.writeShort(var3[var6]); // L: 9085 + var8.packetBuffer.writeByte(0); // L: 9086 + Client.packetWriter.addNode(var8); // L: 9087 + } else if (var0 == 4) { // L: 9089 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2769, Client.packetWriter.isaacCipher); // L: 9091 + var8.packetBuffer.method6962(var3[var6]); // L: 9092 + var8.packetBuffer.method7171(0); // L: 9093 + Client.packetWriter.addNode(var8); // L: 9094 + } else if (var0 == 6) { // L: 9096 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); // L: 9098 + var8.packetBuffer.method7001(var3[var6]); // L: 9099 + var8.packetBuffer.method6993(0); // L: 9100 + Client.packetWriter.addNode(var8); // L: 9101 + } else if (var0 == 7) { // L: 9103 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 9105 + var8.packetBuffer.writeShort(var3[var6]); // L: 9106 + var8.packetBuffer.method7171(0); // L: 9107 + Client.packetWriter.addNode(var8); // L: 9108 + } + + var4 = true; // L: 9110 + break; } } - class54.reflectionChecks.addFirst(var2); - } + if (!var4) { // L: 9114 + class397.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 9115 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 1df0e179a4..c071362851 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,244 +4,244 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("ls") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loe;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("pixels") byte[][] pixels; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("advances") int[] advances; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("widths") int[] widths; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("heights") int[] heights; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("topBearings") int[] topBearings; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("ascent") public int ascent; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("kerning") byte[] kerning; static { - 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, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - 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) { - if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { - var8 = this.topBearings[var10]; - } - - if (this.topBearings[var10] + this.heights[var10] > var9) { - var9 = this.topBearings[var10] + this.heights[var10]; - } - } - - this.maxAscent = this.ascent - var8; - this.maxDescent = var9 - this.ascent; + 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(byte[] var1) { this.pixels = new byte[256][]; this.ascent = 0; - this.readMetrics(var1); - } + this.readMetrics(var1); // L: 54 + } // L: 55 - @ObfuscatedName("l") + 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 + + for (int var10 = 0; var10 < 256; ++var10) { // L: 45 + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { // L: 46 + var8 = this.topBearings[var10]; + } + + if (this.topBearings[var10] + this.heights[var10] > var9) { // L: 47 + var9 = this.topBearings[var10] + this.heights[var10]; + } + } + + this.maxAscent = this.ascent - var8; // L: 49 + this.maxDescent = var9 - this.ascent; // L: 50 + } // L: 51 + + @ObfuscatedName("i") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("e") + @ObfuscatedName("x") @Export("readMetrics") void readMetrics(byte[] var1) { - this.advances = new int[256]; + this.advances = new int[256]; // L: 58 int var2; - if (var1.length == 257) { - for (var2 = 0; var2 < this.advances.length; ++var2) { + if (var1.length == 257) { // L: 59 + for (var2 = 0; var2 < this.advances.length; ++var2) { // L: 60 this.advances[var2] = var1[var2] & 255; } - this.ascent = var1[256] & 255; + this.ascent = var1[256] & 255; // L: 61 } else { - var2 = 0; + var2 = 0; // L: 64 - for (int var3 = 0; var3 < 256; ++var3) { + for (int var3 = 0; var3 < 256; ++var3) { // L: 65 this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; - int[] var4 = new int[256]; + int[] var10 = new int[256]; // L: 66 + int[] var4 = new int[256]; // L: 67 int var5; - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 68 var10[var5] = var1[var2++] & 255; } - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 69 var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; + byte[][] var11 = new byte[256][]; // L: 70 int var8; - for (int var6 = 0; var6 < 256; ++var6) { - var11[var6] = new byte[var10[var6]]; - byte var7 = 0; + for (int var6 = 0; var6 < 256; ++var6) { // L: 71 + var11[var6] = new byte[var10[var6]]; // L: 72 + byte var7 = 0; // L: 73 - for (var8 = 0; var8 < var11[var6].length; ++var8) { - var7 += var1[var2++]; - var11[var6][var8] = var7; + for (var8 = 0; var8 < var11[var6].length; ++var8) { // L: 74 + var7 += var1[var2++]; // L: 75 + var11[var6][var8] = var7; // L: 76 } } - byte[][] var12 = new byte[256][]; + byte[][] var12 = new byte[256][]; // L: 79 int var13; - for (var13 = 0; var13 < 256; ++var13) { - var12[var13] = new byte[var10[var13]]; - byte var14 = 0; + for (var13 = 0; var13 < 256; ++var13) { // L: 80 + var12[var13] = new byte[var10[var13]]; // L: 81 + byte var14 = 0; // L: 82 - for (int var9 = 0; var9 < var12[var13].length; ++var9) { - var14 += var1[var2++]; - var12[var13][var9] = var14; + for (int var9 = 0; var9 < var12[var13].length; ++var9) { // L: 83 + var14 += var1[var2++]; // L: 84 + var12[var13][var9] = var14; // L: 85 } } - this.kerning = new byte[65536]; + this.kerning = new byte[65536]; // L: 88 - 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)method5686(var11, var12, var4, this.advances, var10, var13, var8); + 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)method5800(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 } } } } - this.ascent = var4[32] + var10[32]; + this.ascent = var4[32] + var10[32]; // L: 96 } - } + } // L: 98 - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("charWidth") int charWidth(char var1) { - if (var1 == 160) { + if (var1 == 160) { // L: 123 var1 = ' '; } - return this.advances[MilliClock.charToByteCp1252(var1) & 255]; + return this.advances[AbstractSocket.charToByteCp1252(var1) & 255]; // L: 124 } - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("stringWidth") public int stringWidth(String var1) { - if (var1 == null) { + if (var1 == null) { // L: 128 return 0; } else { - int var2 = -1; - int var3 = -1; - int var4 = 0; + int var2 = -1; // L: 129 + int var3 = -1; // L: 130 + int var4 = 0; // L: 131 - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { - var2 = var5; + 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 } else { - if (var6 == '>' && var2 != -1) { - String var7 = var1.substring(var2 + 1, var5); - var2 = -1; - if (var7.equals("lt")) { + 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 var6 = '<'; } else { - if (!var7.equals("gt")) { - if (var7.startsWith("img=")) { + if (!var7.equals("gt")) { // L: 142 + if (var7.startsWith("img=")) { // L: 143 try { - int var8 = class279.method5134(var7.substring(4)); - var4 += AbstractFont_modIconSprites[var8].width; - var3 = -1; - } catch (Exception var10) { + int var8 = TaskHandler.method2881(var7.substring(4)); // L: 145 + var4 += AbstractFont_modIconSprites[var8].width; // L: 146 + var3 = -1; // L: 147 + } catch (Exception var10) { // L: 149 } } continue; @@ -251,443 +251,443 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var6 == 160) { + if (var6 == 160) { // L: 154 var6 = ' '; } - if (var2 == -1) { - var4 += this.advances[(char)(MilliClock.charToByteCp1252(var6) & 255)]; - if (this.kerning != null && var3 != -1) { + if (var2 == -1) { // L: 155 + var4 += this.advances[(char)(AbstractSocket.charToByteCp1252(var6) & 255)]; // L: 156 + if (this.kerning != null && var3 != -1) { // L: 157 var4 += this.kerning[var6 + (var3 << 8)]; } - var3 = var6; + var3 = var6; // L: 158 } } } - return var4; + return var4; // L: 161 } } - @ObfuscatedName("g") + @ObfuscatedName("l") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if (var1 == null) { + if (var1 == null) { // L: 165 return 0; } else { - int var4 = 0; - int var5 = 0; - StringBuilder var6 = new StringBuilder(100); - int var7 = -1; - int var8 = 0; - byte var9 = 0; - int var10 = -1; - char var11 = 0; - int var12 = 0; - int var13 = var1.length(); + 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 - for (int var14 = 0; var14 < var13; ++var14) { - char var15 = var1.charAt(var14); - if (var15 == '<') { - var10 = var14; + for (int var14 = 0; var14 < var13; ++var14) { // L: 176 + char var15 = var1.charAt(var14); // L: 177 + if (var15 == '<') { // L: 178 + var10 = var14; // L: 179 } else { - if (var15 == '>' && var10 != -1) { - String var16 = var1.substring(var10 + 1, var14); - var10 = -1; - var6.append('<'); - var6.append(var16); - var6.append('>'); - if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); - ++var12; - var5 = var6.length(); - var4 = 0; - var7 = -1; - var11 = 0; - } else if (var16.equals("lt")) { - var4 += this.charWidth('<'); - if (this.kerning != null && var11 != -1) { + 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 var4 += this.kerning[(var11 << '\b') + 60]; } - var11 = '<'; - } else if (var16.equals("gt")) { - var4 += this.charWidth('>'); - if (this.kerning != null && var11 != -1) { + var11 = '<'; // L: 199 + } else if (var16.equals("gt")) { // L: 201 + var4 += this.charWidth('>'); // L: 202 + if (this.kerning != null && var11 != -1) { // L: 203 var4 += this.kerning[(var11 << '\b') + 62]; } - var11 = '>'; - } else if (var16.startsWith("img=")) { + var11 = '>'; // L: 204 + } else if (var16.startsWith("img=")) { // L: 206 try { - int var17 = class279.method5134(var16.substring(4)); - var4 += AbstractFont_modIconSprites[var17].width; - var11 = 0; - } catch (Exception var20) { + int var17 = TaskHandler.method2881(var16.substring(4)); // L: 208 + var4 += AbstractFont_modIconSprites[var17].width; // L: 209 + var11 = 0; // L: 210 + } catch (Exception var20) { // L: 212 } } - var15 = 0; + var15 = 0; // L: 214 } - if (var10 == -1) { - if (var15 != 0) { - var6.append(var15); - var4 += this.charWidth(var15); - if (this.kerning != null && var11 != -1) { + 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 var4 += this.kerning[var15 + (var11 << '\b')]; } - var11 = var15; + var11 = var15; // L: 221 } - if (var15 == ' ') { - var7 = var6.length(); - var8 = var4; - var9 = 1; + if (var15 == ' ') { // L: 223 + var7 = var6.length(); // L: 224 + var8 = var4; // L: 225 + var9 = 1; // L: 226 } - 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 (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 (var15 == '-') { - var7 = var6.length(); - var8 = var4; - var9 = 0; + if (var15 == '-') { // L: 236 + var7 = var6.length(); // L: 237 + var8 = var4; // L: 238 + var9 = 0; // L: 239 } } } } - String var19 = var6.toString(); - if (var19.length() > var5) { + String var19 = var6.toString(); // L: 243 + if (var19.length() > var5) { // L: 244 var3[var12++] = var19.substring(var5, var19.length()); } - return var12; + return var12; // L: 245 } } - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("lineWidth") public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); - int var4 = 0; + int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249 + int var4 = 0; // L: 250 - for (int var5 = 0; var5 < var3; ++var5) { - int var6 = this.stringWidth(AbstractFont_lines[var5]); - if (var6 > var4) { + for (int var5 = 0; var5 < var3; ++var5) { // L: 251 + int var6 = this.stringWidth(AbstractFont_lines[var5]); // L: 252 + if (var6 > var4) { // L: 253 var4 = var6; } } - return var4; + return var4; // L: 255 } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("lineCount") public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259 } - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lme;" + descriptor = "(IILjava/lang/String;II)Lmo;" ) - public Bounds method5693(int var1, int var2, String var3, int var4, int var5) { - 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); + public Bounds method5745(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 } else { - return new Bounds(var4, var5, 0, 0); + return new Bounds(var4, var5, 0, 0); // L: 281 } } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2, var3); + if (var1 != null) { // L: 292 + this.reset(var4, var5); // L: 293 + this.draw0(var1, var2, var3); // L: 294 } - } + } // L: 295 - @ObfuscatedName("p") + @ObfuscatedName("r") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - AbstractFont_alpha = var6; - this.draw0(var1, var2, var3); + if (var1 != null) { // L: 298 + this.reset(var4, var5); // L: 299 + AbstractFont_alpha = var6; // L: 300 + this.draw0(var1, var2, var3); // L: 301 } - } + } // L: 302 - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1), var3); + if (var1 != null) { // L: 305 + this.reset(var4, var5); // L: 306 + this.draw0(var1, var2 - this.stringWidth(var1), var3); // L: 307 } - } + } // L: 308 - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); + if (var1 != null) { // L: 311 + this.reset(var4, var5); // L: 312 + this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); // L: 313 } - } + } // L: 314 - @ObfuscatedName("o") + @ObfuscatedName("f") @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) { + if (var1 == null) { // L: 317 return 0; } else { - this.reset(var6, var7); - if (var10 == 0) { + this.reset(var6, var7); // L: 318 + if (var10 == 0) { // L: 319 var10 = this.ascent; } - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + int[] var11 = new int[]{var4}; // L: 320 + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { // L: 321 var11 = null; } - int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { + int var12 = this.breakLines(var1, var11, AbstractFont_lines); // L: 322 + if (var9 == 3 && var12 == 1) { // L: 324 var9 = 1; } int var13; int var14; - if (var9 == 0) { + if (var9 == 0) { // L: 325 var13 = var3 + this.maxAscent; - } else if (var9 == 1) { + } else if (var9 == 1) { // L: 326 var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { + } else if (var9 == 2) { // L: 327 var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); - if (var14 < 0) { + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); // L: 329 + if (var14 < 0) { // L: 330 var14 = 0; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; + var13 = var3 + var14 + this.maxAscent; // L: 331 + var10 += var14; // L: 332 } - for (var14 = 0; var14 < var12; ++var14) { + for (var14 = 0; var14 < var12; ++var14) { // L: 334 if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 335 + } else if (var8 == 1) { // L: 336 this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { + } else if (var8 == 2) { // L: 337 this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { + } else if (var14 == var12 - 1) { // L: 339 this.draw0(AbstractFont_lines[var14], var2, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); - AbstractFont_justificationTotal = 0; + this.calculateLineJustification(AbstractFont_lines[var14], var4); // L: 341 + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 342 + AbstractFont_justificationTotal = 0; // L: 343 } - var13 += var10; + var13 += var10; // L: 346 } - return var12; + return var12; // L: 348 } } - @ObfuscatedName("r") + @ObfuscatedName("h") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - int[] var7 = new int[var1.length()]; + if (var1 != null) { // L: 352 + this.reset(var4, var5); // L: 353 + int[] var7 = new int[var1.length()]; // L: 354 - for (int var8 = 0; var8 < var1.length(); ++var8) { + for (int var8 = 0; var8 < var1.length(); ++var8) { // L: 355 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); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); // L: 356 } - } + } // L: 357 - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - int[] var7 = new int[var1.length()]; - int[] var8 = new int[var1.length()]; + 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 - 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); + 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 } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); // L: 368 } - } + } // L: 369 - @ObfuscatedName("u") + @ObfuscatedName("ag") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 != null) { - this.reset(var4, var5); - double var8 = 7.0D - (double)var7 / 8.0D; - if (var8 < 0.0D) { + 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 var8 = 0.0D; } - int[] var10 = new int[var1.length()]; + int[] var10 = new int[var1.length()]; // L: 376 - for (int var11 = 0; var11 < var1.length(); ++var11) { + for (int var11 = 0; var11 < var1.length(); ++var11) { // L: 377 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); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); // L: 378 } - } + } // L: 379 - @ObfuscatedName("d") + @ObfuscatedName("ae") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { - 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; + 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 - for (int var9 = 0; var9 < var1.length(); ++var9) { - var7[var9] = var8; - if ((AbstractFont_random.nextInt() & 3) == 0) { + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 388 + var7[var9] = var8; // L: 389 + if ((AbstractFont_random.nextInt() & 3) == 0) { // L: 390 ++var8; } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); + this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); // L: 392 } - } + } // L: 393 - @ObfuscatedName("ab") + @ObfuscatedName("aq") @Export("reset") void reset(int var1, int var2) { - AbstractFont_strike = -1; - AbstractFont_underline = -1; - AbstractFont_previousShadow = var2; + AbstractFont_strike = -1; // L: 396 + AbstractFont_underline = -1; // L: 397 + AbstractFont_previousShadow = var2; // L: 398 AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; + AbstractFont_previousColor = var1; // L: 399 AbstractFont_color = var1; - AbstractFont_alpha = 256; - AbstractFont_justificationTotal = 0; - AbstractFont_justificationCurrent = 0; - } + AbstractFont_alpha = 256; // L: 400 + AbstractFont_justificationTotal = 0; // L: 401 + AbstractFont_justificationCurrent = 0; // L: 402 + } // L: 403 - @ObfuscatedName("ad") + @ObfuscatedName("al") @Export("decodeTag") void decodeTag(String var1) { try { - if (var1.startsWith("col=")) { - AbstractFont_color = class116.method2510(var1.substring(4), 16); - } else if (var1.equals("/col")) { + if (var1.startsWith("col=")) { // L: 407 + AbstractFont_color = ItemComposition.method3407(var1.substring(4), 16); + } else if (var1.equals("/col")) { // L: 408 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { - AbstractFont_strike = class116.method2510(var1.substring(4), 16); - } else if (var1.equals("str")) { + } else if (var1.startsWith("str=")) { // L: 409 + AbstractFont_strike = ItemComposition.method3407(var1.substring(4), 16); + } else if (var1.equals("str")) { // L: 410 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { + } else if (var1.equals("/str")) { // L: 411 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { - AbstractFont_underline = class116.method2510(var1.substring(2), 16); - } else if (var1.equals("u")) { + } else if (var1.startsWith("u=")) { // L: 412 + AbstractFont_underline = ItemComposition.method3407(var1.substring(2), 16); + } else if (var1.equals("u")) { // L: 413 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { + } else if (var1.equals("/u")) { // L: 414 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { - AbstractFont_shadow = class116.method2510(var1.substring(5), 16); - } else if (var1.equals("shad")) { + } else if (var1.startsWith("shad=")) { // L: 415 + AbstractFont_shadow = ItemComposition.method3407(var1.substring(5), 16); + } else if (var1.equals("shad")) { // L: 416 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { + } else if (var1.equals("/shad")) { // L: 417 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { + } else if (var1.equals("br")) { // L: 418 this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var3) { + } catch (Exception var3) { // L: 420 } - } + } // L: 421 - @ObfuscatedName("as") + @ObfuscatedName("am") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; - boolean var4 = false; + int var3 = 0; // L: 424 + boolean var4 = false; // L: 425 - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 426 + char var6 = var1.charAt(var5); // L: 427 + if (var6 == '<') { // L: 428 var4 = true; - } else if (var6 == '>') { + } else if (var6 == '>') { // L: 429 var4 = false; - } else if (!var4 && var6 == ' ') { + } else if (!var4 && var6 == ' ') { // L: 430 ++var3; } } - if (var3 > 0) { + if (var3 > 0) { // L: 432 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } + } // L: 433 - @ObfuscatedName("ak") + @ObfuscatedName("ai") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; - int var4 = -1; - int var5 = -1; + var3 -= this.ascent; // L: 436 + int var4 = -1; // L: 437 + int var5 = -1; // L: 438 - for (int var6 = 0; var6 < var1.length(); ++var6) { - if (var1.charAt(var6) != 0) { - char var7 = (char)(MilliClock.charToByteCp1252(var1.charAt(var6)) & 255); - if (var7 == '<') { - var4 = var6; + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439 + if (var1.charAt(var6) != 0) { // L: 440 + char var7 = (char)(AbstractSocket.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441 + if (var7 == '<') { // L: 442 + var4 = var6; // L: 443 } else { int var9; - if (var7 == '>' && var4 != -1) { - String var8 = var1.substring(var4 + 1, var6); - var4 = -1; - if (var8.equals("lt")) { + if (var7 == '>' && var4 != -1) { // L: 446 + String var8 = var1.substring(var4 + 1, var6); // L: 447 + var4 = -1; // L: 448 + if (var8.equals("lt")) { // L: 449 var7 = '<'; } else { - if (!var8.equals("gt")) { - if (var8.startsWith("img=")) { + if (!var8.equals("gt")) { // L: 450 + if (var8.startsWith("img=")) { // L: 451 try { - var9 = class279.method5134(var8.substring(4)); - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; - var10.drawAt(var2, var3 + this.ascent - var10.height); - var2 += var10.width; - var5 = -1; - } catch (Exception var14) { + var9 = TaskHandler.method2881(var8.substring(4)); // L: 453 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 454 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 455 + var2 += var10.width; // L: 456 + var5 = -1; // L: 457 + } catch (Exception var14) { // L: 459 } } else { - this.decodeTag(var8); + this.decodeTag(var8); // L: 463 } continue; } @@ -696,103 +696,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { + if (var7 == 160) { // L: 467 var7 = ' '; } - if (var4 == -1) { - if (this.kerning != null && var5 != -1) { + if (var4 == -1) { // L: 468 + if (this.kerning != null && var5 != -1) { // L: 469 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; - var9 = this.heights[var7]; - if (var7 != ' ') { - if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { + int var12 = this.widths[var7]; // L: 470 + var9 = this.heights[var7]; // L: 471 + if (var7 != ' ') { // L: 472 + if (AbstractFont_alpha == 256) { // L: 473 + if (AbstractFont_shadow != -1) { // L: 474 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); + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 475 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 478 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); + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 479 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 483 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 484 + var2 += AbstractFont_justificationCurrent >> 8; // L: 485 + AbstractFont_justificationCurrent &= 255; // L: 486 } - int var13 = this.advances[var7]; - if (AbstractFont_strike != -1) { + int var13 = this.advances[var7]; // L: 489 + if (AbstractFont_strike != -1) { // L: 490 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 491 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; - var5 = var7; + var2 += var13; // L: 492 + var5 = var7; // L: 493 } } } } - } + } // L: 496 @ObfuscatedName("ah") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; - int var6 = -1; - int var7 = -1; - int var8 = 0; + var3 -= this.ascent; // L: 499 + int var6 = -1; // L: 500 + int var7 = -1; // L: 501 + int var8 = 0; // L: 502 - for (int var9 = 0; var9 < var1.length(); ++var9) { - if (var1.charAt(var9) != 0) { - char var10 = (char)(MilliClock.charToByteCp1252(var1.charAt(var9)) & 255); - if (var10 == '<') { - var6 = var9; + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503 + if (var1.charAt(var9) != 0) { // L: 504 + char var10 = (char)(AbstractSocket.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505 + if (var10 == '<') { // L: 506 + var6 = var9; // L: 507 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { - String var11 = var1.substring(var6 + 1, var9); - var6 = -1; - if (var11.equals("lt")) { + if (var10 == '>' && var6 != -1) { // L: 510 + String var11 = var1.substring(var6 + 1, var9); // L: 511 + var6 = -1; // L: 512 + if (var11.equals("lt")) { // L: 513 var10 = '<'; } else { - if (!var11.equals("gt")) { - if (var11.startsWith("img=")) { + if (!var11.equals("gt")) { // L: 514 + if (var11.startsWith("img=")) { // L: 515 try { - if (var4 != null) { + if (var4 != null) { // L: 518 var12 = var4[var8]; } else { - var12 = 0; + var12 = 0; // L: 519 } - if (var5 != null) { + if (var5 != null) { // L: 521 var13 = var5[var8]; } else { - var13 = 0; + var13 = 0; // L: 522 } - ++var8; - var14 = class279.method5134(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) { + ++var8; // L: 523 + var14 = TaskHandler.method2881(var11.substring(4)); // L: 524 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 525 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 526 + var2 += var15.width; // L: 527 + var7 = -1; // L: 528 + } catch (Exception var19) { // L: 530 } } else { - this.decodeTag(var11); + this.decodeTag(var11); // L: 534 } continue; } @@ -801,284 +801,284 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { + if (var10 == 160) { // L: 538 var10 = ' '; } - if (var6 == -1) { - if (this.kerning != null && var7 != -1) { + if (var6 == -1) { // L: 539 + if (this.kerning != null && var7 != -1) { // L: 540 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; - var12 = this.heights[var10]; - if (var4 != null) { + int var17 = this.widths[var10]; // L: 541 + var12 = this.heights[var10]; // L: 542 + if (var4 != null) { // L: 544 var13 = var4[var8]; } else { - var13 = 0; + var13 = 0; // L: 545 } - if (var5 != null) { + if (var5 != null) { // L: 547 var14 = var5[var8]; } else { - var14 = 0; + var14 = 0; // L: 548 } - ++var8; - if (var10 != ' ') { - if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { + ++var8; // L: 549 + if (var10 != ' ') { // L: 550 + if (AbstractFont_alpha == 256) { // L: 551 + if (AbstractFont_shadow != -1) { // L: 552 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); + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 553 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 556 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); + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 557 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 561 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 562 + var2 += AbstractFont_justificationCurrent >> 8; // L: 563 + AbstractFont_justificationCurrent &= 255; // L: 564 } - int var18 = this.advances[var10]; - if (AbstractFont_strike != -1) { + int var18 = this.advances[var10]; // L: 567 + if (AbstractFont_strike != -1) { // L: 568 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 569 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; - var7 = var10; + var2 += var18; // L: 570 + var7 = var10; // L: 571 } } } } - } + } // L: 574 - @ObfuscatedName("i") - static int method5686(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { - int var7 = var2[var5]; - int var8 = var7 + var4[var5]; - int var9 = var2[var6]; - int var10 = var9 + var4[var6]; - int var11 = var7; - if (var9 > var7) { + @ObfuscatedName("y") + static int method5800(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 var11 = var9; } - int var12 = var8; - if (var10 < var8) { + int var12 = var8; // L: 107 + if (var10 < var8) { // L: 108 var12 = var10; } - int var13 = var3[var5]; - if (var3[var6] < var13) { + int var13 = var3[var5]; // L: 109 + if (var3[var6] < var13) { // L: 110 var13 = var3[var6]; } - byte[] var14 = var1[var5]; - byte[] var15 = var0[var6]; - int var16 = var11 - var7; - int var17 = var11 - var9; + byte[] var14 = var1[var5]; // L: 111 + byte[] var15 = var0[var6]; // L: 112 + int var16 = var11 - var7; // L: 113 + int var17 = var11 - var9; // L: 114 - for (int var18 = var11; var18 < var12; ++var18) { - int var19 = var14[var16++] + var15[var17++]; - if (var19 < var13) { + for (int var18 = var11; var18 < var12; ++var18) { // L: 115 + int var19 = var14[var16++] + var15[var17++]; // L: 116 + if (var19 < var13) { // L: 117 var13 = var19; } } - return -var13; + return -var13; // L: 119 } - @ObfuscatedName("c") + @ObfuscatedName("z") @Export("escapeBrackets") public static String escapeBrackets(String var0) { - int var1 = var0.length(); - int var2 = 0; + int var1 = var0.length(); // L: 263 + int var2 = 0; // L: 264 - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); + for (int var3 = 0; var3 < var1; ++var3) { // L: 265 + char var4 = var0.charAt(var3); // L: 266 if (var4 == '<' || var4 == '>') { - var2 += 3; + var2 += 3; // L: 267 } } - StringBuilder var6 = new StringBuilder(var1 + var2); + StringBuilder var6 = new StringBuilder(var1 + var2); // L: 269 - for (int var7 = 0; var7 < var1; ++var7) { - char var5 = var0.charAt(var7); + for (int var7 = 0; var7 < var1; ++var7) { // L: 270 + char var5 = var0.charAt(var7); // L: 271 if (var5 == '<') { - var6.append(""); - } else if (var5 == '>') { + var6.append(""); // L: 272 + } else if (var5 == '>') { // L: 273 var6.append(""); } else { - var6.append(var5); + var6.append(var5); // L: 274 } } - return var6.toString(); + return var6.toString(); // L: 276 } - @ObfuscatedName("ay") + @ObfuscatedName("as") @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; - int var7 = Rasterizer2D.Rasterizer2D_width - var3; - int var8 = 0; - int var9 = 0; + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 580 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 581 + int var8 = 0; // L: 582 + int var9 = 0; // L: 583 int var10; - 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 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 584 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 585 + var4 -= var10; // L: 586 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 587 + var9 += var3 * var10; // L: 588 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 589 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 591 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 592 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 593 + var3 -= var10; // L: 594 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 595 + var9 += var10; // L: 596 + var6 += var10; // L: 597 + var8 += var10; // L: 598 + var7 += var10; // L: 599 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var10; - var8 += var10; - var7 += var10; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 601 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 602 + var3 -= var10; // L: 603 + var8 += var10; // L: 604 + var7 += var10; // L: 605 } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); + if (var3 > 0 && var4 > 0) { // L: 607 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 608 } - } + } // L: 609 - @ObfuscatedName("al") + @ObfuscatedName("at") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 612 + var5 = -(var5 & 3); // L: 613 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 614 int var11; - for (var11 = var9; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var9; var11 < 0; ++var11) { // L: 615 + if (var1[var3++] != 0) { // L: 616 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 617 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 618 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 619 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 620 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 621 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 622 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 623 } } - for (var11 = var5; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 625 + if (var1[var3++] != 0) { // L: 626 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 627 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 629 + var3 += var8; // L: 630 } - } + } // L: 632 - @ObfuscatedName("ao") + @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; - int var8 = Rasterizer2D.Rasterizer2D_width - var3; - int var9 = 0; - int var10 = 0; + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 635 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 636 + int var9 = 0; // L: 637 + int var10 = 0; // L: 638 int var11; - 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 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 639 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 640 + var4 -= var11; // L: 641 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 642 + var10 += var3 * var11; // L: 643 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 644 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 646 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 647 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 648 + var3 -= var11; // L: 649 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 650 + var10 += var11; // L: 651 + var7 += var11; // L: 652 + var9 += var11; // L: 653 + var8 += var11; // L: 654 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var11; - var9 += var11; - var8 += var11; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 656 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 657 + var3 -= var11; // L: 658 + var9 += var11; // L: 659 + var8 += var11; // L: 660 } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); + if (var3 > 0 && var4 > 0) { // L: 662 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 663 } - } + } // L: 664 - @ObfuscatedName("au") + @ObfuscatedName("ac") @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; - var9 = 256 - var9; + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 667 + var9 = 256 - var9; // L: 668 - 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; + for (int var10 = -var6; var10 < 0; ++var10) { // L: 669 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 670 + if (var1[var3++] != 0) { // L: 671 + int var12 = var0[var4]; // L: 672 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 673 } else { - ++var4; + ++var4; // L: 675 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 677 + var3 += var8; // L: 678 } - } + } // L: 680 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 57858a01c9..5325607a83 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,51 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +@ObfuscatedName("od") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("f") + @ObfuscatedName("z") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + @ObfuscatedName("s") @Export("pixels") public int[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -504757775 + intValue = 1231434651 ) @Export("width") public int width; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 391329801 + intValue = -1399536545 ) @Export("height") public int height; protected AbstractRasterProvider() { - } + } // L: 8 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "517256419" + garbageValue = "1712436925" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "2140501062" + garbageValue = "-419314546" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("s") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "352466730" + garbageValue = "571325302" ) @Export("apply") public final void apply() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); - } + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 617a5142b8..025fb287c1 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,57 +4,128 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mp") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { - } + } // L: 7 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "82" + garbageValue = "1" ) @Export("close") public abstract void close(); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1780579727" + garbageValue = "1953698452" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-973037380" + garbageValue = "-1632705310" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1444896063" + garbageValue = "-1771919747" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-95" + descriptor = "([BIII)I", + garbageValue = "-1246528305" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "34744814" + garbageValue = "-748791607" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(CI)B", + garbageValue = "1205000986" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { // L: 26 + var1 = -111; + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; + } else { + var1 = 63; // L: 40 + } + + return var1; // L: 41 + } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 746aa1197c..eb3804fcb4 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,13 +2,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bt") +@ObfuscatedName("bl") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("position") int position; AbstractSound() { - } + } // L: 10 } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 47ff6596a1..e96480c5b5 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,103 +4,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("ma") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("u") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1038050583" - ) - @Export("addComparator") - final void addComparator(Comparator var1) { - if (this.nextComparator == null) { - this.nextComparator = var1; - } else if (this.nextComparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.nextComparator).addComparator(var1); - } - - } + } // L: 8 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Llu;Llu;I)I", - garbageValue = "-2140544019" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "-58" + ) + @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 + } + + } // L: 17 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lla;Lla;I)I", + garbageValue = "100896848" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { - return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 } public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "6" - ) - public static String method6049(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; - - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } - - return new String(var3, 0, var4); + return super.equals(var1); // L: 25 } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 6996036c6d..31c97e705a 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,162 +5,162 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gl") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 485777657 + intValue = 793807045 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1648853135 + intValue = -1976495533 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 259813413 + intValue = 1224582621 ) @Export("regionX") int regionX; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1299483951 + intValue = 1447419567 ) @Export("regionY") int regionY; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 333217485 + intValue = -156049595 ) @Export("minPlane") int minPlane; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1265162417 + intValue = 237039767 ) @Export("planes") int planes; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1495826135 + intValue = 2062701093 ) @Export("groupId") int groupId; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1718555041 + intValue = 1770671525 ) @Export("fileId") int fileId; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("s") - byte[][][] field2155; - @ObfuscatedName("c") - byte[][][] field2149; - @ObfuscatedName("b") + @ObfuscatedName("l") + byte[][][] field2154; + @ObfuscatedName("u") + byte[][][] field2145; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[[[Lgk;" + descriptor = "[[[[Lgp;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("x") + @ObfuscatedName("z") boolean field2158; - @ObfuscatedName("p") - boolean field2159; + @ObfuscatedName("q") + boolean field2149; AbstractWorldMapData() { - this.groupId = -1; - this.fileId = -1; + this.groupId = -1; // L: 14 + this.fileId = -1; // L: 15 new LinkedList(); - this.field2158 = false; - this.field2159 = false; + this.field2158 = false; // L: 26 + this.field2149 = false; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "725648072" + descriptor = "(Lop;I)V", + garbageValue = "530647470" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1318755957" + descriptor = "(B)Z", + garbageValue = "109" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2158 && this.field2159; + return this.field2158 && this.field2149; } - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkl;I)V", - garbageValue = "-207227347" + descriptor = "(Lko;I)V", + garbageValue = "1857158984" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { if (!this.isFullyLoaded()) { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { - this.readGeography(new Buffer(var2)); - this.field2158 = true; - this.field2159 = true; + this.readGeography(new Buffer(var2)); // L: 39 + this.field2158 = true; // L: 40 + this.field2149 = true; // L: 41 } } - } + } // L: 43 - @ObfuscatedName("ab") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "973157758" + garbageValue = "-2035301414" ) @Export("reset") void reset() { - this.floorUnderlayIds = null; - this.floorOverlayIds = null; - this.field2155 = null; - this.field2149 = null; - this.decorations = null; - this.field2158 = false; - this.field2159 = false; - } + this.floorUnderlayIds = null; // L: 46 + this.floorOverlayIds = null; // L: 47 + this.field2154 = null; // L: 48 + this.field2145 = null; // L: 49 + this.decorations = null; // L: 50 + this.field2158 = false; // L: 51 + this.field2149 = false; // L: 52 + } // L: 53 - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILot;B)V", - garbageValue = "7" + descriptor = "(IILop;I)V", + garbageValue = "-167681766" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { - int var4 = var3.readUnsignedByte(); - if (var4 != 0) { - if ((var4 & 1) != 0) { - this.method3838(var1, var2, var3, var4); + int var4 = var3.readUnsignedByte(); // L: 56 + if (var4 != 0) { // L: 57 + if ((var4 & 1) != 0) { // L: 60 + this.method3929(var1, var2, var3, var4); // L: 61 } else { - this.method3854(var1, var2, var3, var4); + this.method3930(var1, var2, var3, var4); // L: 64 } } - } + } // L: 58 66 - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IILot;II)V", - garbageValue = "-1781544444" + descriptor = "(IILop;II)V", + garbageValue = "-358725932" ) - void method3838(int var1, int var2, Buffer var3, int var4) { + void method3929(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); @@ -169,67 +169,140 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IILot;II)V", - garbageValue = "817446843" + descriptor = "(IILop;II)V", + garbageValue = "314745138" ) - void method3854(int var1, int var2, Buffer var3, int var4) { + void method3930(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; - boolean var6 = (var4 & 2) != 0; - boolean var7 = (var4 & 4) != 0; - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + boolean var6 = (var4 & 2) != 0; // L: 78 + boolean var7 = (var4 & 4) != 0; // L: 79 + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; int var9; int var11; - if (var6) { - var8 = var3.readUnsignedByte(); + if (var6) { // L: 81 + var8 = var3.readUnsignedByte(); // L: 82 - for (var9 = 0; var9 < var8; ++var9) { - int var14 = var3.readUnsignedByte(); - if (var14 != 0) { - this.floorOverlayIds[var9][var1][var2] = (short)var14; - var11 = var3.readUnsignedByte(); - this.field2155[var9][var1][var2] = (byte)(var11 >> 2); - this.field2149[var9][var1][var2] = (byte)(var11 & 3); + 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.field2154[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2145[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } - if (var7) { - for (var8 = 0; var8 < var5; ++var8) { - var9 = var3.readUnsignedByte(); - if (var9 != 0) { - WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; + 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 - for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method6977(); - int var13 = var3.readUnsignedByte(); - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); + for (var11 = 0; var11 < var9; ++var11) { // L: 100 + int var12 = var3.method6946(); // L: 101 + int var13 = var3.readUnsignedByte(); // L: 102 + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } } } } - } + } // L: 107 - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-344905889" + garbageValue = "1248831647" ) @Export("getRegionX") int getRegionX() { - return this.regionX; + return this.regionX; // L: 112 } - @ObfuscatedName("ay") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1558548546" + garbageValue = "1001102625" ) @Export("getRegionY") int getRegionY() { - return this.regionY; + return this.regionY; // L: 116 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lik;Lpw;B)Lib;", + garbageValue = "-34" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = class92.method2296(); // L: 27 + var2.clientPacket = var0; // L: 28 + var2.clientPacketLength = var0.length; // L: 29 + if (var2.clientPacketLength == -1) { // L: 30 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); // L: 31 + } else if (var2.clientPacketLength <= 18) { // L: 32 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 33 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 34 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lop;II)Ljava/lang/String;", + garbageValue = "-2039941836" + ) + static String method3956(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); // L: 69 + if (var2 > var1) { // L: 70 + var2 = var1; + } + + byte[] var3 = new byte[var2]; // L: 71 + var0.offset += class264.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 72 + String var4 = class264.decodeStringCp1252(var3, 0, var2); // L: 73 + return var4; // L: 74 + } catch (Exception var6) { // L: 76 + return "Cabbage"; // L: 77 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)[Loe;", + garbageValue = "70" + ) + static IndexedSprite[] method3958() { + IndexedSprite[] var0 = new IndexedSprite[class414.SpriteBuffer_spriteCount]; // L: 142 + + for (int var1 = 0; var1 < class414.SpriteBuffer_spriteCount; ++var1) { // L: 143 + IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 144 + var2.width = class414.SpriteBuffer_spriteWidth; // L: 145 + var2.height = class414.SpriteBuffer_spriteHeight; // L: 146 + var2.xOffset = class414.SpriteBuffer_xOffsets[var1]; // L: 147 + var2.yOffset = class414.SpriteBuffer_yOffsets[var1]; // L: 148 + var2.subWidth = UrlRequester.SpriteBuffer_spriteWidths[var1]; // L: 149 + var2.subHeight = class414.SpriteBuffer_spriteHeights[var1]; // L: 150 + var2.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 151 + var2.pixels = class295.SpriteBuffer_pixels[var1]; // L: 152 + } + + PacketBuffer.method6913(); // L: 154 + return var0; // L: 155 } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index d6e09c3087..d7fcd54b56 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -3,243 +3,272 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gz") +@ObfuscatedName("gm") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("t") + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lkd;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lie;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lie;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -426351163 + intValue = -1380271839 ) @Export("screenX") int screenX; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1596897089 + intValue = 380689567 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lic;Lic;)V" + descriptor = "(Lie;Lie;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { - this.coord1 = var1; - this.coord2 = var2; - } + this.coord1 = var1; // L: 13 + this.coord2 = var2; // L: 14 + } // L: 15 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1329338621" + garbageValue = "-1660589105" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)Lga;", - garbageValue = "5309" + descriptor = "(B)Lga;", + garbageValue = "0" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1544604408" + garbageValue = "374350712" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "318612621" + garbageValue = "-1569056170" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1175914629" + garbageValue = "1706303277" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { - if (this.elementFitsScreen(var1, var2)) { - return true; + if (this.elementFitsScreen(var1, var2)) { // L: 18 + return true; // L: 19 } else { - return this.labelFitsScreen(var1, var2); + return this.labelFitsScreen(var1, var2); // L: 21 } } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1433310024" - ) - @Export("hasValidElement") - boolean hasValidElement() { - return this.getElement() >= 0; - } - @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2053967223" + ) + @Export("hasValidElement") + boolean hasValidElement() { + return this.getElement() >= 0; // L: 33 + } + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1158967973" + garbageValue = "1990490630" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { + if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = class13.WorldMapElement_get(this.getElement()); - int var4 = this.getSubWidth(); - int var5 = this.getSubHeight(); - switch(var3.horizontalAlignment.value) { + WorldMapElement var3 = ItemComposition.WorldMapElement_get(this.getElement()); // L: 38 + int var4 = this.getSubWidth(); // L: 39 + int var5 = this.getSubHeight(); // L: 40 + switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { - return false; - } - break; - case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { - break; - } - - return false; - case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { - return false; - } - } - - switch(var3.verticalAlignment.value) { - case 0: - if (var2 > this.screenY - var5 && var2 <= this.screenY) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49 break; } return false; case 1: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 return false; } break; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54 return false; } } - return true; + switch(var3.verticalAlignment.value) { // L: 58 + case 0: + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61 + return false; + } + break; + case 1: + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71 + return false; + } + break; + case 2: + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66 + return false; + } + } + + return true; // L: 75 } } - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "358371055" + descriptor = "(IIB)Z", + garbageValue = "84" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { - 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 <= var3.height + this.screenY; + WorldMapLabel var3 = this.getLabel(); // L: 79 + if (var3 == null) { // L: 80 + return false; // L: 81 + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 + return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84 } else { - return false; + return false; // L: 85 } } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2018731183" + descriptor = "(ILbp;ZI)I", + garbageValue = "-1528171345" ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Len;", - garbageValue = "1432352072" - ) - public static Clock method3943() { - try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1775904885" - ) - static int method3945(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class12.getWindowedMode(); - return 1; + static int method4026(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 433 + return WorldMapLabelSize.method3540(var0, var1, var2); + } else if (var0 < 1100) { // L: 434 + return BZip2State.method7179(var0, var1, var2); + } else if (var0 < 1200) { // L: 435 + return class132.method2766(var0, var1, var2); + } else if (var0 < 1300) { // L: 436 + return class19.method290(var0, var1, var2); + } else if (var0 < 1400) { // L: 437 + return WorldMapEvent.method4105(var0, var1, var2); + } else if (var0 < 1500) { // L: 438 + return MusicPatch.method4950(var0, var1, var2); + } else if (var0 < 1600) { // L: 439 + return ViewportMouse.method4622(var0, var1, var2); + } else if (var0 < 1700) { // L: 440 + return WorldMapSection1.method3999(var0, var1, var2); + } else if (var0 < 1800) { // L: 441 + return class54.method1101(var0, var1, var2); + } else if (var0 < 1900) { // L: 442 + return GraphicsObject.method1896(var0, var1, var2); + } else if (var0 < 2000) { // L: 443 + return InterfaceParent.method2079(var0, var1, var2); + } else if (var0 < 2100) { // L: 444 + return BZip2State.method7179(var0, var1, var2); + } else if (var0 < 2200) { // L: 445 + return class132.method2766(var0, var1, var2); + } else if (var0 < 2300) { // L: 446 + return class19.method290(var0, var1, var2); + } else if (var0 < 2400) { // L: 447 + return WorldMapEvent.method4105(var0, var1, var2); + } else if (var0 < 2500) { + return MusicPatch.method4950(var0, var1, var2); // L: 448 + } else if (var0 < 2600) { // L: 449 + return GrandExchangeOfferWorldComparator.method5439(var0, var1, var2); + } else if (var0 < 2700) { // L: 450 + return class196.method3972(var0, var1, var2); + } else if (var0 < 2800) { // L: 451 + return MouseRecorder.method2089(var0, var1, var2); + } else if (var0 < 2900) { // L: 452 + return class13.method173(var0, var1, var2); + } else if (var0 < 3000) { // L: 453 + return InterfaceParent.method2079(var0, var1, var2); + } else if (var0 < 3200) { // L: 454 + return ScriptFrame.method1118(var0, var1, var2); + } else if (var0 < 3300) { // L: 455 + return class123.method2618(var0, var1, var2); + } else if (var0 < 3400) { // L: 456 + return UrlRequester.method2427(var0, var1, var2); + } else if (var0 < 3500) { // L: 457 + return World.method1668(var0, var1, var2); + } else if (var0 < 3600) { // L: 458 + return GameEngine.method555(var0, var1, var2); + } else if (var0 < 3700) { // L: 459 + return class139.method2837(var0, var1, var2); + } else if (var0 < 3800) { // L: 460 + return class129.method2738(var0, var1, var2); + } else if (var0 < 3900) { // L: 461 + return SoundCache.method799(var0, var1, var2); + } else if (var0 < 4000) { // L: 462 + return Fonts.method6687(var0, var1, var2); + } else if (var0 < 4100) { // L: 463 + return class14.method190(var0, var1, var2); + } else if (var0 < 4200) { + return class28.method401(var0, var1, var2); // L: 464 + } else if (var0 < 4300) { // L: 465 + return TileItem.method2309(var0, var1, var2); + } else if (var0 < 5100) { // L: 466 + return class114.method2542(var0, var1, var2); + } else if (var0 < 5400) { // L: 467 + return class91.method2271(var0, var1, var2); + } else if (var0 < 5600) { // L: 468 + return InvDefinition.method2982(var0, var1, var2); + } else if (var0 < 5700) { // L: 469 + return class184.method3871(var0, var1, var2); + } else if (var0 < 6300) { // L: 470 + return GrandExchangeOfferOwnWorldComparator.method1158(var0, var1, var2); + } else if (var0 < 6600) { // L: 471 + return class12.method171(var0, var1, var2); + } else if (var0 < 6700) { // L: 472 + return ArchiveDiskActionHandler.method5257(var0, var1, var2); + } else if (var0 < 6800) { // L: 473 + return class123.method2608(var0, var1, var2); + } else if (var0 < 6900) { // L: 474 + return class244.method4727(var0, var1, var2); + } else if (var0 < 7000) { // L: 475 + return ChatChannel.method2012(var0, var1, var2); + } else if (var0 < 7100) { // L: 476 + return class139.method2845(var0, var1, var2); + } else if (var0 < 7200) { // L: 477 + return class67.method1914(var0, var1, var2); } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class392.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapDecorationType.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 5311) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 5312) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 5350) { - class54.Interpreter_stringStackSize -= 2; - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 5351) { - --class54.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapDecorationType.clientPreferences.windowMode = var3; - ScriptFrame.savePreferences(); - } - - return 1; - } + return var0 < 7300 ? class28.method402(var0, var1, var2) : 2; // L: 478 479 } } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index a2266195ab..b8cac8c585 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -3,157 +3,137 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.io.SyncFailedException; -import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") +@ObfuscatedName("nv") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("pq") - @ObfuscatedSignature( - descriptor = "Lec;" - ) - @Export("mouseWheel") - static class144 mouseWheel; - @ObfuscatedName("am") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("file") RandomAccessFile file; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -672899169781171493L + longValue = -1037204394665170999L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 492034629015795711L + longValue = -743568297070171741L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { + if (-1L == var3) { // L: 11 var3 = Long.MAX_VALUE; } - if (var1.length() > var3) { - var1.delete(); + if (var1.length() > var3) { // L: 12 + var1.delete(); // L: 13 } - 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 = 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.seek(0L); - } + this.file.seek(0L); // L: 23 + } // L: 24 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("seek") final void seek(long var1) throws IOException { - this.file.seek(var1); - this.offset = var1; - } + this.file.seek(var1); // L: 27 + this.offset = var1; // L: 28 + } // L: 29 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "([BIIS)V", - garbageValue = "-18286" + garbageValue = "-31371" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { - this.file.seek(this.maxSize); - this.file.write(1); - throw new EOFException(); + if ((long)var3 + this.offset > this.maxSize) { // L: 32 + this.file.seek(this.maxSize); // L: 33 + this.file.write(1); // L: 34 + throw new EOFException(); // L: 35 } else { - this.file.write(var1, var2, var3); - this.offset += (long)var3; + this.file.write(var1, var2, var3); // L: 37 + this.offset += (long)var3; // L: 38 } - } + } // L: 39 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "23" + garbageValue = "91" ) @Export("close") public final void close() throws IOException { - this.closeSync(false); - } + this.closeSync(false); // L: 42 + } // L: 43 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "1" + garbageValue = "-14" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { - if (this.file != null) { - if (var1) { + if (this.file != null) { // L: 46 + if (var1) { // L: 47 try { - this.file.getFD().sync(); - } catch (SyncFailedException var3) { + this.file.getFD().sync(); // L: 49 + } catch (SyncFailedException var3) { // L: 51 } } - this.file.close(); - this.file = null; + this.file.close(); // L: 53 + this.file = null; // L: 54 } - } + } // L: 56 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "1317310270" + garbageValue = "-633440828" ) @Export("length") public final long length() throws IOException { - return this.file.length(); + return this.file.length(); // L: 59 } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1029557368" + garbageValue = "1378280482" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); + int var4 = this.file.read(var1, var2, var3); // L: 63 if (var4 > 0) { - this.offset += (long)var4; + this.offset += (long)var4; // L: 64 } - return var4; + return var4; // L: 65 } protected void finalize() throws Throwable { - if (this.file != null) { - System.out.println(""); - this.close(); + if (this.file != null) { // L: 69 + System.out.println(""); // L: 70 + this.close(); // L: 71 } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lkl;III)Lon;", - garbageValue = "-528990707" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !VarbitComposition.method3102(var0, var1, var2) ? null : SoundCache.method784(); - } + } // L: 73 } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 52e8477385..cb39ce12b9 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,716 +4,542 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("ct") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ah") + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 62759075 + intValue = 1224542185 + ) + static int field1146; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 1060488561 ) @Export("x") int x; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1009828555 + intValue = 1758566435 ) @Export("y") int y; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1423374395 + intValue = -780864819 ) @Export("rotation") int rotation; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("isWalking") boolean isWalking; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1160515319 + intValue = 1850945247 ) - int field1109; - @ObfuscatedName("aa") + int field1087; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1147297953 + intValue = 1010787109 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1048949801 + intValue = 1162942381 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1606324787 + intValue = -976729951 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 715696475 + intValue = 1205631887 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1052608255 + intValue = 1698656563 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 513855783 + intValue = -1827265149 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 930462249 + intValue = -862066401 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -964291647 + intValue = -680764833 ) @Export("walkRightSequence") int walkRightSequence; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1974909991 + intValue = 528537939 ) @Export("runSequence") int runSequence; @ObfuscatedName("ap") @Export("overheadText") String overheadText; - @ObfuscatedName("aj") + @ObfuscatedName("au") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("am") - boolean field1121; - @ObfuscatedName("aw") + @ObfuscatedName("aj") + boolean field1099; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1274300065 + intValue = -1349162329 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1634662763 + intValue = -485598179 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ae") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1844091037 + intValue = 1527060029 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("af") + @ObfuscatedName("ay") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bj") + @ObfuscatedName("bt") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lkf;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bx") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1294228425 + intValue = -1726125141 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @Export("false0") boolean false0; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1908710717 + intValue = -1484671141 ) - int field1134; - @ObfuscatedName("ba") + int field1112; + @ObfuscatedName("bm") + boolean field1127; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1559878903 + intValue = 1478500765 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bm") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 470210683 + intValue = 1354844887 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bv") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -94469869 + intValue = 909600967 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bs") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -174294577 + intValue = -153672255 ) @Export("sequence") int sequence; - @ObfuscatedName("bd") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1395712137 + intValue = 688727445 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bb") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1907492289 + intValue = -701592673 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bh") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1363443673 + intValue = 1424121639 ) @Export("sequenceDelay") int sequenceDelay; @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 2070977901 + intValue = -1810491641 ) - int field1142; - @ObfuscatedName("bq") + int field1116; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1362318977 + intValue = -1442456691 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1330353911 + intValue = 1112868275 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("be") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1656933541 + intValue = 914687343 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bw") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -341495445 - ) - int field1105; - @ObfuscatedName("bn") - @ObfuscatedGetter( - intValue = 475790425 - ) - int field1147; - @ObfuscatedName("bl") - @ObfuscatedGetter( - intValue = -1307254299 - ) - int field1148; - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = -1553617601 - ) - int field1149; - @ObfuscatedName("bp") - @ObfuscatedGetter( - intValue = -1049240827 - ) - int field1126; - @ObfuscatedName("br") - @ObfuscatedGetter( - intValue = 401025355 + intValue = -577715243 ) int field1125; + @ObfuscatedName("bb") + @ObfuscatedGetter( + intValue = 539982077 + ) + int field1126; + @ObfuscatedName("by") + @ObfuscatedGetter( + intValue = -222009755 + ) + int field1083; + @ObfuscatedName("ba") + @ObfuscatedGetter( + intValue = 964367307 + ) + int field1128; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = 646319749 + ) + int field1100; @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 321143973 + intValue = 154596387 ) - int field1145; - @ObfuscatedName("ct") + int field1130; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 1090012593 + intValue = -1879657163 ) - int field1165; - @ObfuscatedName("cy") + int field1131; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -2139655667 + intValue = -438636187 ) - int field1151; - @ObfuscatedName("cg") + int field1132; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 492191773 + intValue = 1091823721 + ) + int field1133; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -685467991 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("ci") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -2069346077 + intValue = -1735337961 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cx") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1495923269 + intValue = 1488414823 ) @Export("orientation") int orientation; @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -1736409391 + intValue = -2044798983 ) - int field1158; - @ObfuscatedName("cp") + int field1137; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -951772859 + intValue = 369982221 ) - int field1146; + int field1138; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -504625235 + intValue = 274803431 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cr") + @ObfuscatedName("cs") @Export("pathX") int[] pathX; - @ObfuscatedName("cq") + @ObfuscatedName("ce") @Export("pathY") int[] pathY; - @ObfuscatedName("cs") + @ObfuscatedName("cp") @Export("pathTraversed") byte[] pathTraversed; + @ObfuscatedName("cg") + @ObfuscatedGetter( + intValue = -405619359 + ) + int field1085; @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1675210125 + intValue = 910802769 ) - int field1164; - @ObfuscatedName("ce") + int field1144; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 158996051 + intValue = -947188393 ) - int field1129; + int field1145; Actor() { - this.isWalking = false; - this.field1109 = 1; - this.idleSequence = -1; - this.turnLeftSequence = -1; - this.turnRightSequence = -1; - this.walkSequence = -1; - this.walkBackSequence = -1; - this.walkLeftSequence = -1; - this.walkRightSequence = -1; - this.runSequence = -1; - this.overheadText = null; - this.field1121 = false; - this.overheadTextCyclesRemaining = 100; - this.overheadTextColor = 0; - this.overheadTextEffect = 0; - this.hitSplatCount = 0; - this.hitSplatTypes = new int[4]; - this.hitSplatValues = new int[4]; - this.hitSplatCycles = new int[4]; - this.hitSplatTypes2 = new int[4]; - this.hitSplatValues2 = new int[4]; - this.healthBars = new IterableNodeDeque(); - this.targetIndex = -1; - this.false0 = false; - this.field1134 = -1; - this.movementSequence = -1; - this.movementFrame = 0; - this.movementFrameCycle = 0; - this.sequence = -1; - this.sequenceFrame = 0; - this.sequenceFrameCycle = 0; - this.sequenceDelay = 0; - this.field1142 = 0; - this.spotAnimation = -1; - this.spotAnimationFrame = 0; - this.spotAnimationFrameCycle = 0; - this.npcCycle = 0; - this.defaultHeight = 200; - this.field1158 = 0; - this.field1146 = 32; - this.pathLength = 0; - this.pathX = new int[10]; - this.pathY = new int[10]; - this.pathTraversed = new byte[10]; - this.field1164 = 0; - this.field1129 = 0; - } + this.isWalking = false; // L: 12 + this.field1087 = 1; // L: 13 + this.idleSequence = -1; // L: 15 + this.turnLeftSequence = -1; // L: 16 + this.turnRightSequence = -1; // L: 17 + this.walkSequence = -1; // L: 18 + this.walkBackSequence = -1; // L: 19 + this.walkLeftSequence = -1; // L: 20 + this.walkRightSequence = -1; // L: 21 + this.runSequence = -1; // L: 22 + this.overheadText = null; // L: 23 + this.field1099 = false; // L: 25 + this.overheadTextCyclesRemaining = 100; // L: 26 + this.overheadTextColor = 0; // L: 27 + this.overheadTextEffect = 0; // L: 28 + this.hitSplatCount = 0; // L: 30 + this.hitSplatTypes = new int[4]; // L: 31 + this.hitSplatValues = new int[4]; // L: 32 + this.hitSplatCycles = new int[4]; // L: 33 + this.hitSplatTypes2 = new int[4]; // L: 34 + this.hitSplatValues2 = new int[4]; // L: 35 + this.healthBars = new IterableNodeDeque(); // L: 36 + this.targetIndex = -1; // L: 37 + this.false0 = false; // L: 38 + this.field1112 = -1; // L: 39 + this.movementSequence = -1; // L: 41 + this.movementFrame = 0; // L: 42 + this.movementFrameCycle = 0; // L: 43 + this.sequence = -1; // L: 44 + this.sequenceFrame = 0; // L: 45 + this.sequenceFrameCycle = 0; // L: 46 + this.sequenceDelay = 0; // L: 47 + this.field1116 = 0; // L: 48 + this.spotAnimation = -1; // L: 49 + this.spotAnimationFrame = 0; // L: 50 + this.spotAnimationFrameCycle = 0; // L: 51 + this.npcCycle = 0; // L: 61 + this.defaultHeight = 200; // L: 62 + this.field1137 = 0; // L: 64 + this.field1138 = 32; // L: 65 + this.pathLength = 0; // L: 66 + this.pathX = new int[10]; // L: 67 + this.pathY = new int[10]; // L: 68 + this.pathTraversed = new byte[10]; // L: 69 + this.field1085 = 0; // L: 70 + this.field1144 = 0; // L: 71 + this.field1145 = -1; // L: 72 + } // L: 74 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1841514183" + garbageValue = "-532391824" ) @Export("isVisible") boolean isVisible() { - return false; + return false; // L: 82 } - @ObfuscatedName("bj") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-256199204" + descriptor = "(B)V", + garbageValue = "64" ) - final void method2137() { - this.pathLength = 0; - this.field1129 = 0; - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "1" - ) - @Export("addHitSplat") - final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; - boolean var8 = true; - - int var9; - for (var9 = 0; var9 < 4; ++var9) { - if (this.hitSplatCycles[var9] > var5) { - var7 = false; - } else { - var8 = false; - } - } - - var9 = -1; - int var10 = -1; - int var11 = 0; - if (var1 >= 0) { - HitSplatDefinition var12 = ItemContainer.method2057(var1); - var10 = var12.field1815; - var11 = var12.field1806; - } - - int var14; - if (var8) { - if (var10 == -1) { - return; - } - - var9 = 0; - var14 = 0; - if (var10 == 0) { - var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { - var14 = this.hitSplatValues[0]; - } - - 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) { - var9 = var13; - var14 = this.hitSplatValues[var13]; - } - } - - if (var10 == 1 && var14 >= var2) { - return; - } - } else { - if (var7) { - this.hitSplatCount = 0; - } - - 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) { - this.hitSplatTypes[var9] = var1; - this.hitSplatValues[var9] = var2; - this.hitSplatTypes2[var9] = var3; - this.hitSplatValues2[var9] = var4; - this.hitSplatCycles[var9] = var5 + var11 + var6; - } - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1531936528" - ) - @Export("addHealthBar") - final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var7; - if (var8 != null) { - var7 = var8; - } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var8 = new HealthBarDefinition(); - if (var9 != null) { - var8.decode(new Buffer(var9)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); - var7 = var8; - } - - var8 = var7; - HealthBar var14 = null; - HealthBar var10 = null; - int var11 = var7.int2; - int var12 = 0; - - HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { - ++var12; - if (var13.definition.field1675 == var8.field1675) { - var13.put(var2 + var4, var5, var6, var3); - return; - } - - if (var13.definition.int1 <= var8.int1) { - var14 = var13; - } - - if (var13.definition.int2 > var11) { - var10 = var13; - var11 = var13.definition.int2; - } - } - - if (var10 != null || var12 < 4) { - var13 = new HealthBar(var8); - if (var14 == null) { - this.healthBars.addLast(var13); - } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); - } - - var13.put(var2 + var4, var5, var6, var3); - if (var12 >= 4) { - var10.remove(); - } - - } - } + final void method2165() { + this.pathLength = 0; // L: 77 + this.field1144 = 0; // L: 78 + } // L: 79 @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-54" + descriptor = "(IIIIIIB)V", + garbageValue = "32" + ) + @Export("addHitSplat") + final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 86 + boolean var8 = true; // L: 87 + + int var9; + for (var9 = 0; var9 < 4; ++var9) { // L: 88 + if (this.hitSplatCycles[var9] > var5) { // L: 89 + var7 = false; + } else { + var8 = false; // L: 90 + } + } + + var9 = -1; // L: 92 + int var10 = -1; // L: 93 + int var11 = 0; // L: 94 + if (var1 >= 0) { // L: 95 + HitSplatDefinition var12 = Canvas.method372(var1); // L: 96 + var10 = var12.field1816; // L: 97 + var11 = var12.field1805; // L: 98 + } + + int var14; + if (var8) { // L: 100 + if (var10 == -1) { // L: 101 + return; + } + + var9 = 0; // L: 102 + var14 = 0; // L: 103 + if (var10 == 0) { // L: 104 + var14 = this.hitSplatCycles[0]; + } else if (var10 == 1) { // L: 105 + var14 = this.hitSplatValues[0]; + } + + for (int var13 = 1; var13 < 4; ++var13) { // L: 106 + if (var10 == 0) { // L: 107 + if (this.hitSplatCycles[var13] < var14) { // L: 108 + var9 = var13; // L: 109 + var14 = this.hitSplatCycles[var13]; // L: 110 + } + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 113 114 + var9 = var13; // L: 115 + var14 = this.hitSplatValues[var13]; // L: 116 + } + } + + if (var10 == 1 && var14 >= var2) { // L: 120 + return; + } + } else { + if (var7) { // L: 123 + this.hitSplatCount = 0; + } + + for (var14 = 0; var14 < 4; ++var14) { // L: 124 + byte var15 = this.hitSplatCount; // L: 125 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 126 + if (this.hitSplatCycles[var15] <= var5) { // L: 127 + var9 = var15; // L: 128 + break; // L: 129 + } + } + } + + if (var9 >= 0) { // L: 133 + this.hitSplatTypes[var9] = var1; // L: 134 + this.hitSplatValues[var9] = var2; // L: 135 + this.hitSplatTypes2[var9] = var3; // L: 136 + this.hitSplatValues2[var9] = var4; // L: 137 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 138 + } + } // L: 139 + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-2125214461" + ) + @Export("addHealthBar") + final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { + HealthBarDefinition var7 = ObjectSound.method1772(var1); // L: 142 + HealthBar var8 = null; // L: 143 + HealthBar var9 = null; // L: 144 + int var10 = var7.int2; // L: 145 + int var11 = 0; // L: 146 + + HealthBar var12; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 147 + ++var11; // L: 148 + if (var12.definition.field1668 == var7.field1668) { // L: 149 + var12.put(var2 + var4, var5, var6, var3); // L: 150 + return; // L: 151 + } + + if (var12.definition.int1 <= var7.int1) { // L: 153 + var8 = var12; + } + + if (var12.definition.int2 > var10) { // L: 154 + var9 = var12; // L: 155 + var10 = var12.definition.int2; // L: 156 + } + } + + if (var9 != null || var11 < 4) { // L: 159 + var12 = new HealthBar(var7); // L: 160 + if (var8 == null) { // L: 161 + this.healthBars.addLast(var12); + } else { + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 162 + } + + var12.put(var2 + var4, var5, var6, var3); // L: 163 + if (var11 >= 4) { // L: 164 + var9.remove(); + } + + } + } // L: 165 + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1759022108" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var3 = new HealthBarDefinition(); - if (var4 != null) { - var3.decode(new Buffer(var4)); - } + HealthBarDefinition var2 = ObjectSound.method1772(var1); // L: 168 - HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); - var2 = var3; - } - - var3 = var2; - - for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { - if (var3 == var5.definition) { - var5.remove(); - return; + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 169 + if (var2 == var3.definition) { // L: 170 + var3.remove(); // L: 171 + return; // L: 172 } } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;III)Llt;", - garbageValue = "-2030666937" - ) - public static Font method2153(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - if (!VarbitComposition.method3102(var0, var2, var3)) { - return null; - } else { - byte[] var5 = var1.takeFile(var2, var3); - Font var4; - if (var5 == null) { - var4 = null; - } else { - Font var6 = new Font(var5, class135.SpriteBuffer_xOffsets, class131.SpriteBuffer_yOffsets, class414.SpriteBuffer_spriteWidths, class16.SpriteBuffer_spriteHeights, class351.SpriteBuffer_spritePalette, class414.SpriteBuffer_pixels); - StudioGame.method5130(); - var4 = var6; - } - - return var4; - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIIIZB)Lon;", - garbageValue = "0" - ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0; - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemComposition var9 = class87.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = class87.ItemDefinition_get(var10); - } - } - - Model var19 = var9.getModel(1); - if (var19 == null) { - return null; - } else { - SpritePixels var20 = null; - if (var9.noteTemplate != -1) { - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var20 == null) { - return null; - } - } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var20 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var20 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new SpritePixels(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method4122(16, 16); - Rasterizer3D.field2348 = false; - if (var9.placeholderTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var19.calculateBoundsCylinder(); - var19.method4454(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - ItemComposition.ItemDefinition_fontPlain11.draw(class16.method212(var1), 0, 9, 16776960, 1); - } - - if (!var5) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field2348 = true; - return var8; - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-466966431" - ) - static final void method2152(String var0) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2725, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + } // L: 175 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index ea77924ea1..ca39640524 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("he") @Implements("Animation") public class Animation { - @ObfuscatedName("l") + @ObfuscatedName("i") + static int[] field2317; + @ObfuscatedName("w") + static int[] field2309; + @ObfuscatedName("s") + static int[] field2314; + @ObfuscatedName("a") static int[] field2312; - @ObfuscatedName("q") - static int[] field2306; - @ObfuscatedName("f") - static int[] field2307; - @ObfuscatedName("j") - static int[] field2308; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lha;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("transformCount") int transformCount; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("transformXs") int[] transformXs; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("transformYs") int[] transformYs; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("transformZs") int[] transformZs; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2312 = new int[500]; - field2306 = new int[500]; - field2307 = new int[500]; - field2308 = new int[500]; + field2317 = new int[500]; // L: 8 + field2309 = new int[500]; // L: 9 + field2314 = new int[500]; // L: 10 + field2312 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLhg;)V" + descriptor = "([BLha;)V" ) Animation(byte[] var1, Skeleton var2) { - 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; + 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 int var8; - 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) { - field2312[var7] = var10; - field2306[var7] = 0; - field2307[var7] = 0; - field2308[var7] = 0; - ++var7; + 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 + field2317[var7] = var10; // L: 35 + field2309[var7] = 0; // L: 36 + field2314[var7] = 0; // L: 37 + field2312[var7] = 0; // L: 38 + ++var7; // L: 39 break; } } } - field2312[var7] = var8; - short var11 = 0; - if (this.skeleton.transformTypes[var8] == 3) { + field2317[var7] = var8; // L: 44 + short var11 = 0; // L: 45 + if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } - if ((var9 & 1) != 0) { - field2306[var7] = var4.readShortSmart(); + if ((var9 & 1) != 0) { // L: 47 + field2309[var7] = var4.readShortSmart(); } else { - field2306[var7] = var11; + field2309[var7] = var11; // L: 48 } - if ((var9 & 2) != 0) { - field2307[var7] = var4.readShortSmart(); + if ((var9 & 2) != 0) { // L: 49 + field2314[var7] = var4.readShortSmart(); } else { - field2307[var7] = var11; + field2314[var7] = var11; // L: 50 } - if ((var9 & 4) != 0) { - field2308[var7] = var4.readShortSmart(); + if ((var9 & 4) != 0) { // L: 51 + field2312[var7] = var4.readShortSmart(); } else { - field2308[var7] = var11; + field2312[var7] = var11; // L: 52 } - var6 = var8; - ++var7; - if (this.skeleton.transformTypes[var8] == 5) { + var6 = var8; // L: 53 + ++var7; // L: 54 + if (this.skeleton.transformTypes[var8] == 5) { // L: 55 this.hasAlphaTransform = true; } } } - if (var1.length != var4.offset) { - throw new RuntimeException(); + if (var1.length != var4.offset) { // L: 58 + throw new RuntimeException(); // L: 59 } else { - this.transformCount = var7; - this.transformSkeletonLabels = new int[var7]; - this.transformXs = new int[var7]; - this.transformYs = new int[var7]; - this.transformZs = new int[var7]; + 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 - for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field2312[var8]; - this.transformXs[var8] = field2306[var8]; - this.transformYs[var8] = field2307[var8]; - this.transformZs[var8] = field2308[var8]; + for (var8 = 0; var8 < var7; ++var8) { // L: 66 + this.transformSkeletonLabels[var8] = field2317[var8]; // L: 67 + this.transformXs[var8] = field2309[var8]; // L: 68 + this.transformYs[var8] = field2314[var8]; // L: 69 + this.transformZs[var8] = field2312[var8]; // L: 70 } } - } + } // L: 72 } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index a776f903a7..b809953458 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -3,210 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bx") +@ObfuscatedName("bs") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("rs") + @ObfuscatedName("qr") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "Lpz;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("ee") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("de") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lkd;" ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "[Loz;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("mo") + @Export("archive1") + static Archive archive1; + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = 1922813723 + intValue = 1994087319 ) - @Export("menuHeight") - static int menuHeight; + @Export("worldPort") + static int worldPort; ApproximateRouteStrategy() { - } + } // L: 12118 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIILfy;I)Z", - garbageValue = "1728008342" + descriptor = "(IIILfq;I)Z", + garbageValue = "-526381699" ) @Export("hasArrived") public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Lex;", - garbageValue = "1251239719" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class351.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "2048562583" - ) - static int method1095(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = UserComparator7.method2421(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ClientPreferences.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class133.method2706(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapIcon_1.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = VertexNormal.Client_plane; - var4 = (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX; - var5 = (class67.localPlayer.y >> 7) + PlayerComposition.baseY; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = UserComparator7.method2421(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ClientPreferences.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class133.method2706(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.field495; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.field496; - return 1; - } else { - return 2; - } - } - } + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12121 } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 9bcb4d62f0..7f57aef9e7 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,401 +5,407 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kd") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("f") + @ObfuscatedName("eg") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lkd;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lmr;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmr;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1410432427 + intValue = -1928964095 ) @Export("index") int index; - @ObfuscatedName("k") - volatile boolean field3686; - @ObfuscatedName("t") - boolean field3683; - @ObfuscatedName("a") + @ObfuscatedName("g") + volatile boolean field3673; + @ObfuscatedName("e") + boolean field3674; + @ObfuscatedName("p") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1839449919 + intValue = 1953931107 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 886571455 + intValue = 619553041 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1993950793 + intValue = 1459687887 ) - int field3676; + int field3679; static { - Archive_crc = new CRC32(); + Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Lmm;Lmm;IZZZ)V" + descriptor = "(Lmr;Lmr;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); - this.field3686 = false; - this.field3683 = false; - this.field3676 = -1; - this.archiveDisk = var1; - this.masterDisk = var2; - this.index = var3; - this.field3683 = var6; - UserComparator6.method2466(this, this.index); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-5" - ) - public boolean method5201() { - return this.field3686; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "64" - ) - @Export("percentage") - public int percentage() { - if (this.field3686) { - return 100; - } else if (super.groups != null) { - return 99; + super(var4, var5); // L: 23 + this.field3673 = false; // L: 14 + this.field3674 = false; // L: 15 + this.field3679 = -1; // L: 20 + this.archiveDisk = var1; // L: 24 + this.masterDisk = var2; // L: 25 + this.index = var3; // L: 26 + this.field3674 = var6; // L: 27 + int var8 = this.index; // L: 29 + if (class139.NetCache_reference != null) { // L: 31 + class139.NetCache_reference.offset = var8 * 8 + 5; // L: 32 + int var9 = class139.NetCache_reference.readInt(); // L: 33 + int var10 = class139.NetCache_reference.readInt(); // L: 34 + this.loadIndex(var9, var10); // L: 35 } else { - int var1 = ArchiveDiskActionHandler.method5168(255, this.index); - if (var1 >= 100) { - var1 = 99; - } - - return var1; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "30" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - class150.method2874(this.index, var1); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "120" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - ArchiveDisk var2 = this.archiveDisk; - byte[] var4 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { - var4 = var6.data; - break; - } - } - } - - if (var4 != null) { - this.load(var2, var1, var4, true); - } else { - byte[] var5 = var2.read(var1); - this.load(var2, var1, var5, true); - } - } else { - ClanSettings.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + AbstractByteArrayCopier.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 + NetCache.NetCache_archives[var8] = this; // L: 39 } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1828412488" - ) - @Export("loadIndex") - public void loadIndex(int var1, int var2) { - this.indexCrc = var1; - this.indexVersion = var2; - if (this.masterDisk != null) { - int var3 = this.index; - ArchiveDisk var4 = this.masterDisk; - byte[] var6 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { - var6 = var8.data; - break; - } - } - } - - if (var6 != null) { - this.load(var4, var3, var6, true); - } else { - byte[] var7 = var4.read(var3); - this.load(var4, var3, var7, true); - } - } else { - ClanSettings.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "-657787925" - ) - @Export("write") - public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { - if (this.field3686) { - throw new RuntimeException(); - } - - if (this.masterDisk != null) { - class150.method2873(this.index, var2, this.masterDisk); - } - - this.decodeIndex(var2); - this.loadAllLocal(); - } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.groupVersions[var1]; - if (this.archiveDisk != null) { - class150.method2873(var1, var2, this.archiveDisk); - this.validGroups[var1] = true; - } - - if (var4) { - super.groups[var1] = DevicePcmPlayerProvider.method372(var2, false); - } - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lmm;I[BZB)V", - garbageValue = "68" - ) - @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { - if (this.field3686) { - throw new RuntimeException(); - } - - if (var3 == null) { - ClanSettings.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); - var5 = (int)Archive_crc.getValue(); - if (var5 != this.indexCrc) { - ClanSettings.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - Buffer var11 = new Buffer(class12.decompressBytes(var3)); - int var12 = var11.readUnsignedByte(); - if (var12 != 5 && var12 != 6) { - throw new RuntimeException(var12 + "," + this.index + "," + var2); - } - - int var8 = 0; - if (var12 >= 6) { - var8 = var11.readInt(); - } - - if (var8 != this.indexVersion) { - ClanSettings.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - this.decodeIndex(var3); - this.loadAllLocal(); - } else { - if (!var4 && var2 == this.field3676) { - this.field3686 = true; - } - - if (var3 == null || var3.length <= 2) { - this.validGroups[var2] = false; - if (this.field3683 || var4) { - ClanSettings.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; - } - - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length - 2); - var5 = (int)Archive_crc.getValue(); - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { - this.validGroups[var2] = false; - if (this.field3683 || var4) { - ClanSettings.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; - } - - this.validGroups[var2] = true; - if (var4) { - Object[] var7 = super.groups; - Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; - } else { - var9 = var3; - } - - var7[var2] = var9; - } - } - - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2097641089" - ) - @Export("loadAllLocal") - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { - this.field3686 = true; - } else { - this.field3676 = -1; - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { - if (super.fileCounts[var1] > 0) { - class133.method2707(var1, this.archiveDisk, this); - this.field3676 = var1; - } - } - - if (this.field3676 == -1) { - this.field3686 = true; - } - - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { - return 100; - } else { - return this.validGroups[var1] ? 100 : ArchiveDiskActionHandler.method5168(this.index, var1); - } - } + } // L: 41 @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-700098712" + descriptor = "(I)Z", + garbageValue = "-625670103" ) - public boolean method5179(int var1) { - return this.validGroups[var1]; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "36" - ) - public boolean method5180(int var1) { - return this.getGroupFileIds(var1) != null; + public boolean method5260() { + return this.field3673; // L: 44 } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1632636897" + garbageValue = "1260592296" ) - @Export("loadPercent") - public int loadPercent() { - int var1 = 0; - int var2 = 0; + @Export("percentage") + public int percentage() { + if (this.field3673) { // L: 48 + return 100; + } else if (super.groups != null) { // L: 49 + return 99; + } else { + int var1 = HealthBarUpdate.method2185(255, this.index); // L: 50 + if (var1 >= 100) { // L: 51 + var1 = 99; + } - int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { - if (super.fileCounts[var3] > 0) { - var1 += 100; - var2 += this.groupLoadPercent(var3); + return var1; // L: 52 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "297974277" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + AttackOption.method2297(this.index, var1); // L: 56 + } // L: 57 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "23" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 60 + class318.method5887(var1, this.archiveDisk, this); + } else { + AbstractByteArrayCopier.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 61 + } + + } // L: 62 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-60" + ) + @Export("loadIndex") + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 65 + this.indexVersion = var2; // L: 66 + if (this.masterDisk != null) { // L: 67 + class318.method5887(this.index, this.masterDisk, this); + } else { + AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 68 + } + + } // L: 69 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I[BZZI)V", + garbageValue = "-1126308164" + ) + @Export("write") + public void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 72 + if (this.field3673) { // L: 73 + throw new RuntimeException(); // L: 74 + } + + if (this.masterDisk != null) { // L: 76 + int var5 = this.index; // L: 77 + ArchiveDisk var6 = this.masterDisk; // L: 78 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 80 + var7.type = 0; // L: 81 + var7.key = (long)var5; // L: 82 + var7.data = var2; // L: 83 + var7.archiveDisk = var6; // L: 84 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 85 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 86 + } // L: 87 + + Login.method1952(); // L: 88 + } + + this.decodeIndex(var2); // L: 91 + this.loadAllLocal(); // L: 92 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 95 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 96 + if (this.archiveDisk != null) { // L: 97 + ArchiveDisk var11 = this.archiveDisk; // L: 98 + ArchiveDiskAction var16 = new ArchiveDiskAction(); // L: 100 + var16.type = 0; // L: 101 + var16.key = (long)var1; // L: 102 + var16.data = var2; // L: 103 + var16.archiveDisk = var11; // L: 104 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 105 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var16); // L: 106 + } // L: 107 + + Login.method1952(); // L: 108 + this.validGroups[var1] = true; // L: 110 + } + + if (var4) { // L: 112 + Object[] var15 = super.groups; // L: 113 + Object var17; + if (var2 == null) { // L: 117 + var17 = null; // L: 118 + } else if (var2.length > 136) { // L: 121 + DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 123 + var8.set(var2); // L: 124 + var17 = var8; // L: 125 + } else { + var17 = var2; // L: 130 + } + + var15[var1] = var17; // L: 132 } } - if (var1 == 0) { + } // L: 135 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lmr;I[BZI)V", + garbageValue = "702092430" + ) + @Export("load") + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 138 + if (this.field3673) { // L: 139 + throw new RuntimeException(); // L: 140 + } + + if (var3 == null) { // L: 142 + AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 143 + return; // L: 144 + } + + Archive_crc.reset(); // L: 146 + Archive_crc.update(var3, 0, var3.length); // L: 147 + var5 = (int)Archive_crc.getValue(); // L: 148 + if (var5 != this.indexCrc) { // L: 149 + AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 150 + return; // L: 151 + } + + Buffer var11 = new Buffer(ByteArrayPool.decompressBytes(var3)); // L: 153 + int var12 = var11.readUnsignedByte(); // L: 154 + if (var12 != 5 && var12 != 6) { // L: 155 + throw new RuntimeException(var12 + "," + this.index + "," + var2); + } + + int var8 = 0; // L: 156 + if (var12 >= 6) { // L: 157 + var8 = var11.readInt(); + } + + if (var8 != this.indexVersion) { // L: 158 + AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 159 + return; // L: 160 + } + + this.decodeIndex(var3); // L: 162 + this.loadAllLocal(); // L: 163 + } else { + if (!var4 && var2 == this.field3679) { // L: 166 + this.field3673 = true; // L: 167 + } + + if (var3 == null || var3.length <= 2) { // L: 169 + this.validGroups[var2] = false; // L: 170 + if (this.field3674 || var4) { // L: 171 + AbstractByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 172 + } + + Archive_crc.reset(); // L: 174 + Archive_crc.update(var3, 0, var3.length - 2); // L: 175 + var5 = (int)Archive_crc.getValue(); // L: 176 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 177 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 178 + this.validGroups[var2] = false; // L: 179 + if (this.field3674 || var4) { + AbstractByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); // L: 180 + } + + return; // L: 181 + } + + this.validGroups[var2] = true; // L: 183 + if (var4) { // L: 184 + Object[] var7 = super.groups; // L: 185 + Object var9; + if (var3 == null) { // L: 189 + var9 = null; // L: 190 + } else if (var3.length > 136) { // L: 193 + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 195 + var10.set(var3); // L: 196 + var9 = var10; // L: 197 + } else { + var9 = var3; // L: 202 + } + + var7[var2] = var9; // L: 204 + } + } + + } // L: 207 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1618182910" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 210 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 211 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 212 + this.field3673 = true; // L: 213 + } else { + this.field3679 = -1; // L: 216 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 217 + if (super.fileCounts[var1] > 0) { // L: 218 + ClanSettings.method2653(var1, this.archiveDisk, this); // L: 219 + this.field3679 = var1; // L: 220 + } + } + + if (this.field3679 == -1) { // L: 223 + this.field3673 = true; + } + + } + } // L: 214 224 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "14" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 227 return 100; } else { - var3 = var2 * 100 / var1; - return var3; + return this.validGroups[var1] ? 100 : HealthBarUpdate.method2185(this.index, var1); // L: 228 229 } } - @ObfuscatedName("kg") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "255" + descriptor = "(II)Z", + garbageValue = "836290734" ) - static final void method5187() { - Client.field686 = Client.cycleCntr; - WorldMapSectionType.ClanChat_inClanChat = true; + public boolean method5269(int var1) { + return this.validGroups[var1]; // L: 233 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-9" + ) + public boolean method5270(int var1) { + return this.getGroupFileIds(var1) != null; // L: 237 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1624563419" + ) + @Export("loadPercent") + public int loadPercent() { + int var1 = 0; // L: 241 + int var2 = 0; // L: 242 + + int var3; + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 243 + if (super.fileCounts[var3] > 0) { // L: 244 + var1 += 100; // L: 245 + var2 += this.groupLoadPercent(var3); // L: 246 + } + } + + if (var1 == 0) { // L: 249 + return 100; + } else { + var3 = var2 * 100 / var1; // L: 250 + return var3; // L: 251 + } } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index c2dae48b5f..84750adee1 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,331 +6,343 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mr") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - @Export("datFile") - BufferedFile datFile; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - @Export("idxFile") - BufferedFile idxFile; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -785983377 + intValue = 668775777 ) @Export("archive") int archive; - @ObfuscatedName("m") + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + @Export("datFile") + BufferedFile datFile; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + @Export("idxFile") + BufferedFile idxFile; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 769550411 + intValue = -588931295 ) @Export("maxEntrySize") int maxEntrySize; static { - ArchiveDisk_buffer = new byte[520]; + ArchiveDisk_buffer = new byte[520]; // L: 7 } @ObfuscatedSignature( - descriptor = "(ILnq;Lnq;I)V" + descriptor = "(ILnw;Lnw;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.datFile = null; - this.idxFile = null; - this.maxEntrySize = 65000; - this.archive = var1; - this.datFile = var2; - this.idxFile = var3; - this.maxEntrySize = 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "110" + descriptor = "(II)[B", + garbageValue = "703320501" ) @Export("read") public byte[] read(int var1) { - synchronized(this.datFile) { + synchronized(this.datFile) { // L: 21 try { Object var10000; - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 23 var10000 = null; return (byte[])var10000; } else { - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var3 < 0 || var3 > this.maxEntrySize) { + 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 var10000 = null; return (byte[])var10000; - } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { + } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { // L: 29 var10000 = null; return (byte[])var10000; } else { - byte[] var5 = new byte[var3]; - int var6 = 0; + byte[] var5 = new byte[var3]; // L: 30 + int var6 = 0; // L: 31 - for (int var7 = 0; var6 < var3; ++var7) { - if (var4 == 0) { + for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 + if (var4 == 0) { // L: 34 var10000 = null; return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); - int var8 = var3 - var6; + this.datFile.seek((long)var4 * 520L); // L: 35 + int var8 = var3 - var6; // L: 36 int var9; int var10; int var11; int var12; byte var13; - if (var1 > 65535) { - if (var8 > 510) { + if (var1 > 65535) { // L: 42 + if (var8 > 510) { // L: 43 var8 = 510; } - var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); - 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; + var13 = 10; // L: 44 + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // 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 } else { - if (var8 > 512) { + if (var8 > 512) { // L: 52 var8 = 512; } - var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); - var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - var12 = ArchiveDisk_buffer[7] & 255; + var13 = 8; // L: 53 + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54 + var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55 + var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56 + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57 + var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { + if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 var10000 = null; return (byte[])var10000; } - int var14 = var13 + var8; + int var14 = var13 + var8; // L: 62 - for (int var15 = var13; var15 < var14; ++var15) { + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 var5[var6++] = ArchiveDisk_buffer[var15]; } - var4 = var11; + var4 = var11; // L: 64 } byte[] var20 = var5; - return var20; + return var20; // L: 67 } } - } catch (IOException var18) { - return null; + } catch (IOException var18) { // L: 69 + return null; // L: 70 } } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I[BII)Z", - garbageValue = "1641243917" + descriptor = "(I[BIB)Z", + garbageValue = "8" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { - synchronized(this.datFile) { - if (var3 >= 0 && var3 <= this.maxEntrySize) { - boolean var5 = this.write0(var1, var2, var3, true); + synchronized(this.datFile) { // L: 76 + if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 + boolean var5 = this.write0(var1, var2, var3, true); // L: 80 if (!var5) { - var5 = this.write0(var1, var2, var3, false); + var5 = this.write0(var1, var2, var3, false); // L: 81 } - return var5; + return var5; // L: 82 } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); // L: 78 } } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-1115646093" + garbageValue = "-1304792790" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { - synchronized(this.datFile) { + synchronized(this.datFile) { // L: 87 try { int var6; boolean var10000; - if (var4) { - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { + if (var4) { // L: 90 + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 91 var10000 = false; return var10000; } - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { + 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 var10000 = false; return var10000; } } else { - var6 = (int)((this.datFile.length() + 519L) / 520L); - if (var6 == 0) { + var6 = (int)((this.datFile.length() + 519L) / 520L); // L: 98 + if (var6 == 0) { // L: 99 var6 = 1; } } - 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; + 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 while (true) { - if (var7 < var3) { - label171: { - int var9 = 0; + if (var7 < var3) { // L: 111 + label170: { + int var9 = 0; // L: 112 int var10; - if (var4) { - this.datFile.seek(520L * (long)var6); + if (var4) { // L: 113 + this.datFile.seek(520L * (long)var6); // L: 114 int var11; int var12; - if (var1 > 65535) { + if (var1 > 65535) { // L: 118 try { - this.datFile.read(ArchiveDisk_buffer, 0, 10); - } catch (EOFException var17) { - break label171; + this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 + } catch (EOFException var17) { // L: 122 + break label170; // L: 123 } - 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; + 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 } else { try { - this.datFile.read(ArchiveDisk_buffer, 0, 8); - } catch (EOFException var16) { - break label171; + this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 + } catch (EOFException var16) { // L: 134 + break label170; // L: 135 } - 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; + 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 } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { + if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } - if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { + if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { // L: 143 var10000 = false; return var10000; } } - if (var9 == 0) { - var4 = false; - var9 = (int)((this.datFile.length() + 519L) / 520L); - if (var9 == 0) { + if (var9 == 0) { // L: 145 + var4 = false; // L: 146 + var9 = (int)((this.datFile.length() + 519L) / 520L); // L: 147 + if (var9 == 0) { // L: 148 ++var9; } - if (var9 == var6) { + if (var6 == var9) { // L: 149 ++var9; } } - if (var1 > 65535) { - if (var3 - var7 <= 510) { + if (var1 > 65535) { // L: 151 + if (var3 - var7 <= 510) { // L: 152 var9 = 0; } - 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(520L * (long)var6); - this.datFile.write(ArchiveDisk_buffer, 0, 10); - var10 = var3 - var7; - if (var10 > 510) { + 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(520L * (long)var6); // L: 163 + this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 + var10 = var3 - var7; // L: 165 + if (var10 > 510) { // L: 166 var10 = 510; } - this.datFile.write(var2, var7, var10); - var7 += var10; + this.datFile.write(var2, var7, var10); // L: 167 + var7 += var10; // L: 168 } else { - if (var3 - var7 <= 512) { + if (var3 - var7 <= 512) { // L: 171 var9 = 0; } - 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) { + 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(520L * (long)var6); // L: 180 + this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 + var10 = var3 - var7; // L: 182 + if (var10 > 512) { // L: 183 var10 = 512; } - this.datFile.write(var2, var7, var10); - var7 += var10; + this.datFile.write(var2, var7, var10); // L: 184 + var7 += var10; // L: 185 } - var6 = var9; - ++var8; - continue; + var6 = var9; // L: 187 + ++var8; // L: 188 + continue; // L: 189 } } - var10000 = true; + var10000 = true; // L: 190 return var10000; } - } catch (IOException var18) { - return false; + } catch (IOException var18) { // L: 192 + return false; // L: 193 } } } public String toString() { - return "" + this.archive; + return "" + this.archive; // L: 198 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-4" + ) + public static void method6322() { + ObjectComposition.ObjectDefinition_cached.clear(); // L: 407 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 408 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 409 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 410 + } // L: 411 } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 1954b5494e..897199f894 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,60 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jc") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("mq") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -900370285 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1004921481 + intValue = -1877309383 ) @Export("type") int type; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("data") - public byte[] data; - @ObfuscatedName("f") + byte[] data; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmr;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("j") + ArchiveDisk archiveDisk; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lkd;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1831916314" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = ViewportMouse.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - ViewportMouse.runScriptEvent(var5); - } - - Client.field647 = var3; - Client.isSpellSelected = true; - ModelData0.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - ObjectComposition.selectedSpellFlags = var2; - class16.invalidateWidget(var4); - } + } // L: 12 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index e0394be804..a09d19641a 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -1,144 +1,506 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ks") +@ObfuscatedName("kg") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("ArchiveDiskActionHandler_requestQueue") - public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("q") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("f") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -490833597 + intValue = 2039125055 ) - public static int field3671; - @ObfuscatedName("j") + public static int field3662; + @ObfuscatedName("a") @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("o") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1828605303 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; static { - ArchiveDiskActionHandler_requestQueue = new NodeDeque(); - ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3671 = 0; + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 + field3662 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); - } + } // L: 12 ArchiveDiskActionHandler() { - } + } // L: 15 public void run() { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); - } + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 74 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 75 + } // L: 76 - 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); - } + if (var1 != null) { // L: 77 + if (var1.type == 0) { // L: 78 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 79 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 80 + var1.remove(); // L: 81 + } // L: 82 + } else if (var1.type == 1) { // L: 84 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 85 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 86 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 87 + } // L: 88 } - synchronized(ArchiveDiskActionHandler_lock) { - if (field3671 <= 1) { - field3671 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + synchronized(ArchiveDiskActionHandler_lock) { // L: 90 + if (field3662 <= 1) { // L: 91 + field3662 = 0; // L: 92 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 93 + return; // L: 94 } - field3671 = 600; + field3662 = 600; // L: 96 } } else { - class121.method2542(100L); - synchronized(ArchiveDiskActionHandler_lock) { - if (field3671 <= 1) { - field3671 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + FloorUnderlayDefinition.method3190(100L); // L: 100 + synchronized(ArchiveDiskActionHandler_lock) { // L: 101 + if (field3662 <= 1) { // L: 102 + field3662 = 0; // L: 103 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 104 + return; // L: 105 } - --field3671; + --field3662; // L: 107 } } } - } catch (Exception var13) { - Timer.RunException_sendStackTrace((String)null, var13); + } catch (Exception var13) { // L: 112 + MilliClock.RunException_sendStackTrace((String)null, var13); // L: 113 } - } + } // L: 115 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Loy;B)V", - garbageValue = "-104" + descriptor = "(S)V", + garbageValue = "15810" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class67.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 - WorldMapSectionType.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - PlayerComposition.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - VertexNormal.Client_plane = var2.plane = var4; - if (Players.field1248[var1] != null) { - var2.read(Players.field1248[var1]); + static void method5258() { + if (Login.clearLoginScreen) { // L: 267 + Login.titleboxSprite = null; // L: 268 + Login.titlebuttonSprite = null; // L: 269 + Login.runesSprite = null; // L: 270 + RouteStrategy.leftTitleSprite = null; // L: 271 + class139.rightTitleSprite = null; // L: 272 + class16.logoSprite = null; // L: 273 + VarpDefinition.title_muteSprite = null; // L: 274 + NetSocket.options_buttons_0Sprite = null; // L: 275 + class9.options_buttons_2Sprite = null; // L: 276 + DirectByteArrayCopier.worldSelectBackSprites = null; // L: 277 + UserComparator7.worldSelectFlagSprites = null; // L: 278 + class54.worldSelectArrows = null; // L: 279 + KeyHandler.worldSelectStars = null; // L: 280 + class12.field54 = null; // L: 281 + Login.loginScreenRunesAnimation.method2193(); // L: 282 + class247.musicPlayerStatus = 1; // L: 284 + class128.musicTrackArchive = null; // L: 285 + FillMode.musicTrackGroupId = -1; // L: 286 + musicTrackFileId = -1; // L: 287 + class247.musicTrackVolume = 0; // L: 288 + SecureRandomCallable.musicTrackBoolean = false; // L: 289 + class247.pcmSampleLength = 2; // L: 290 + if (NetCache.NetCache_socket != null) { // L: 293 + try { + Buffer var0 = new Buffer(4); // L: 295 + var0.writeByte(2); // L: 296 + var0.writeMedium(0); // L: 297 + NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 298 + } catch (IOException var3) { + try { + NetCache.NetCache_socket.close(); // L: 302 + } catch (Exception var2) { // L: 304 + } + + ++NetCache.NetCache_ioExceptions; // L: 305 + NetCache.NetCache_socket = null; // L: 306 + } + } + + Login.clearLoginScreen = false; // L: 309 } + } // L: 310 - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1247[var1] = 0; - Players.Players_emptyIdxCount = 0; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-146684783" + ) + static int method5257(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3911 + var3 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3912 + int var15 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 3913 + int var8 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 3914 + class54.getWorldMap().method6497(var3, var15, var8, true); // L: 3915 + return 1; // L: 3916 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3918 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3919 + String var16 = ""; // L: 3920 + var9 = class54.getWorldMap().getMapArea(var3); // L: 3921 + if (var9 != null) { // L: 3922 + var16 = var9.getExternalName(); // L: 3923 + } - for (int var7 = 1; var7 < 2048; ++var7) { - if (var7 != var1) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.field1247[var7] = 0; + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var16; // L: 3925 + return 1; // L: 3926 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3928 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3929 + class54.getWorldMap().setCurrentMapAreaId(var3); // L: 3930 + return 1; // L: 3931 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3933 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getZoomLevel(); // L: 3934 + return 1; // L: 3935 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3937 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3938 + class54.getWorldMap().setZoomPercentage(var3); // L: 3939 + return 1; // L: 3940 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3942 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3943 + return 1; // L: 3944 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3946 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3947 + class54.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3948 + return 1; // L: 3949 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3951 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3952 + class54.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3953 + return 1; // L: 3954 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3956 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3957 + class54.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3958 + return 1; // L: 3959 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3961 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3962 + class54.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3963 + return 1; // L: 3964 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3966 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayX(); // L: 3967 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayY(); // L: 3968 + return 1; // L: 3969 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3971 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3972 + var11 = class54.getWorldMap().getMapArea(var3); // L: 3973 + if (var11 == null) { // L: 3974 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3975 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3978 + } + + return 1; // L: 3980 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3982 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3983 + var11 = class54.getWorldMap().getMapArea(var3); // L: 3984 + if (var11 == null) { // L: 3985 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3986 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3987 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3990 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3991 + } + + return 1; // L: 3993 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3995 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3996 + var11 = class54.getWorldMap().getMapArea(var3); // L: 3997 + if (var11 == null) { // L: 3998 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3999 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4000 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4001 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4002 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4005 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4006 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4007 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4008 + } + + return 1; // L: 4010 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4012 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4013 + var11 = class54.getWorldMap().getMapArea(var3); // L: 4014 + if (var11 == null) { // L: 4015 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4016 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4019 + } + + return 1; // L: 4021 + } else if (var0 == 6615) { // L: 4023 + var14 = class54.getWorldMap().getDisplayCoord(); // L: 4024 + if (var14 == null) { // L: 4025 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4026 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4027 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var14.x; // L: 4030 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var14.y; // L: 4031 + } + + return 1; // L: 4033 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4035 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().currentMapAreaId(); // L: 4036 + return 1; // L: 4037 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4039 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4040 + var11 = class54.getWorldMap().getCurrentMapArea(); // L: 4041 + if (var11 == null) { // L: 4042 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4043 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4044 + return 1; // L: 4045 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4047 + if (var12 == null) { // L: 4048 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4049 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4050 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12[0]; // L: 4053 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12[1]; // L: 4054 + } + + return 1; // L: 4056 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 4058 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4059 + var11 = class54.getWorldMap().getCurrentMapArea(); // L: 4060 + if (var11 == null) { // L: 4061 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4062 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4063 + return 1; // L: 4064 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 4066 + if (var5 == null) { // L: 4067 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4068 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.packed(); // L: 4071 + } + + return 1; // L: 4073 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 4075 + class14.Interpreter_intStackSize -= 2; // L: 4076 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4077 + var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4078 + class16.method219(var3, var10, false); // L: 4079 + return 1; // L: 4080 + } else if (var0 == 6620) { // L: 4082 + class14.Interpreter_intStackSize -= 2; // L: 4083 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4084 + var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4085 + class16.method219(var3, var10, true); // L: 4086 + return 1; // L: 4087 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4089 + class14.Interpreter_intStackSize -= 2; // L: 4090 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4091 + var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4092 + var9 = class54.getWorldMap().getMapArea(var3); // L: 4093 + if (var9 == null) { // L: 4094 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4095 + return 1; // L: 4096 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4098 + return 1; // L: 4099 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4101 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayWith(); // L: 4102 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayHeight(); // L: 4103 + return 1; // L: 4104 + } else if (var0 == 6623) { // L: 4106 + var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4107 + var11 = class54.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4108 + if (var11 == null) { // L: 4109 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4110 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getId(); // L: 4113 + } + + return 1; // L: 4115 + } else if (var0 == 6624) { // L: 4117 + class54.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4118 + return 1; // L: 4119 + } else if (var0 == 6625) { // L: 4121 + class54.getWorldMap().resetMaxFlashCount(); // L: 4122 + return 1; // L: 4123 + } else if (var0 == 6626) { // L: 4125 + class54.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4126 + return 1; // L: 4127 + } else if (var0 == 6627) { // L: 4129 + class54.getWorldMap().resetCyclesPerFlash(); // L: 4130 + return 1; // L: 4131 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4133 + var13 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 4134 + class54.getWorldMap().setPerpetualFlash(var13); // L: 4135 + return 1; // L: 4136 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4138 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4139 + class54.getWorldMap().flashElement(var3); // L: 4140 + return 1; // L: 4141 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4143 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4144 + class54.getWorldMap().flashCategory(var3); // L: 4145 + return 1; // L: 4146 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4148 + class54.getWorldMap().stopCurrentFlashes(); // L: 4149 + return 1; // L: 4150 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4152 + var13 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 4153 + class54.getWorldMap().setElementsDisabled(var13); // L: 4154 + return 1; // L: 4155 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4157 + class14.Interpreter_intStackSize -= 2; // L: 4158 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4159 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 4160 + class54.getWorldMap().disableElement(var3, var7); // L: 4161 + return 1; // L: 4162 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4164 + class14.Interpreter_intStackSize -= 2; // L: 4165 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4166 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 4167 + class54.getWorldMap().setCategoryDisabled(var3, var7); // L: 4168 + return 1; // L: 4169 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4171 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4172 + return 1; // L: 4173 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4175 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4176 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4177 + return 1; // L: 4178 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4180 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4181 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4182 + return 1; // L: 4183 + } else if (var0 == 6638) { // L: 4185 + class14.Interpreter_intStackSize -= 2; // L: 4186 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4187 + var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4188 + var5 = class54.getWorldMap().method6666(var3, var10); // L: 4189 + if (var5 == null) { // L: 4190 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4191 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.packed(); // L: 4194 + } + + return 1; // L: 4196 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4198 + var6 = class54.getWorldMap().iconStart(); // L: 4199 + if (var6 == null) { // L: 4200 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4201 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4202 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4205 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4206 + } + + return 1; // L: 4208 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4210 + var6 = class54.getWorldMap().iconNext(); // L: 4211 + if (var6 == null) { // L: 4212 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4213 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4214 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4217 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4218 + } + + return 1; // L: 4220 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4222 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4223 + var4 = ItemComposition.WorldMapElement_get(var3); // L: 4224 + if (var4.name == null) { // L: 4225 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4226 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.name; // L: 4229 + } + + return 1; // L: 4231 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4233 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4234 + var4 = ItemComposition.WorldMapElement_get(var3); // L: 4235 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.textSize; // L: 4236 + return 1; // L: 4237 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4239 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4240 + var4 = ItemComposition.WorldMapElement_get(var3); // L: 4241 + if (var4 == null) { // L: 4242 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4243 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.category; // L: 4246 + } + + return 1; // L: 4248 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4250 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4251 + var4 = ItemComposition.WorldMapElement_get(var3); // L: 4252 + if (var4 == null) { // L: 4253 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4254 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4257 + } + + return 1; // L: 4259 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4261 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.mapElement; // L: 4262 + return 1; // L: 4263 + } else if (var0 == 6698) { // L: 4265 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.coord1.packed(); // L: 4266 + return 1; // L: 4267 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4269 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.coord2.packed(); // L: 4270 + return 1; // L: 4271 + } else { + return 2; // L: 4273 + } + } + } + } + } + } + } + } } } - - var0.exportIndex(); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-551096239" - ) - static int method5168(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return ClanChannel.NetCache_currentResponse != null && ClanChannel.NetCache_currentResponse.key == var2 ? StudioGame.NetCache_responseArchiveBuffer.offset * 99 / (StudioGame.NetCache_responseArchiveBuffer.array.length - ClanChannel.NetCache_currentResponse.padding) + 1 : 0; } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 5f0cf2c1ab..bf4e5ddd86 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,683 +4,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("ba") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("q") + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = 1501018991 + ) + static int field985; + @ObfuscatedName("aa") + @Export("client") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lclient;" + ) + static Client client; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljk;" + ) + static GameBuild field984; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lkd;" ) @Export("archive") final Archive archive; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1979540381 + intValue = 1984155091 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 33253959 + intValue = 756623687 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lky;Ljava/lang/String;)V" + descriptor = "(Lkd;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { - this.loadedCount = 0; - this.archive = var1; - this.groupCount = var1.getGroupCount(); - } + this.loadedCount = 0; // L: 9 + this.archive = var1; // L: 12 + this.groupCount = var1.getGroupCount(); // L: 13 + } // L: 14 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1480484971" + garbageValue = "897874246" ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; + this.loadedCount = 0; // L: 17 - for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method5180(var1) || this.archive.method5179(var1)) { - ++this.loadedCount; + for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 + if (!this.archive.method5270(var1) || this.archive.method5269(var1)) { + ++this.loadedCount; // L: 19 } } - return this.loadedCount >= this.groupCount; + return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("id") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([Ljt;IIIIIIIIB)V", - garbageValue = "-70" + descriptor = "(II)Lef;", + garbageValue = "-1421588196" ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; - } - - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !ObjectSound.isComponentHidden(var10)) { - if (var10.contentType > 0) { - class9.method87(var10); - } - - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - ReflectionCheck.field452 = var0; - Script.field954 = var6; - UserComparator3.field1338 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field595) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field669) { - var15 = Client.field669; - } - - if (var15 + var10.width > Client.field669 + Client.clickedWidgetParent.width) { - var15 = Client.field669 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field670) { - var16 = Client.field670; - } - - if (var16 + var10.height > Client.field670 + Client.clickedWidgetParent.height) { - var16 = Client.field670 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - class262.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; - } - - class262.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - PendingSpawn.drawEntities(var12, var13, var10.width, var10.height); - Client.field710[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - class113.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - Skills.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - TileItem.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - TileItem.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - Login.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && ObjectSound.isComponentHidden(var10) && var10 != VarpDefinition.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var30 != null) { - Canvas.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field525[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - Messages.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var19 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var21 * (var10.paddingX + 32) + var12; - var23 = var13 + var20 * (var10.paddingY + 32); - if (var19 < 20) { - var22 += var10.inventoryXOffsets[var19]; - var23 += var10.inventoryYOffsets[var19]; - } - - if (var10.itemIds[var19] <= 0) { - if (var10.inventorySprites != null && var19 < 20) { - SpritePixels var46 = var10.getInventorySprite(var19); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field3045) { - class16.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; - boolean var38 = false; - var26 = var10.itemIds[var19] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == GameEngine.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == ArchiveDiskAction.selectedItemSlot && var10.id == UserComparator6.selectedItemWidget) { - var35 = Actor.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = Actor.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var35 != null) { - if (var10 == GameEngine.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) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var35.drawTransAt(var24 + var22, var25 + var23, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field536 / 3; - if (var29 > Client.field536 * 10) { - var29 = Client.field536 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - class16.invalidateWidget(var28); - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field536 / 3; - if (var29 > Client.field536 * 10) { - var29 = Client.field536 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - class16.invalidateWidget(var28); - } - } - } else if (var10 == class7.field31 && var19 == Client.field597) { - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); - } - } else { - class16.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (BufferedNetSocket.runCs1(var10)) { - var19 = var10.color2; - if (var10 == VarpDefinition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == VarpDefinition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4369) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else { - Font var39; - if (var10.type == 4) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field3045) { - class16.invalidateWidget(var10); - } - } else { - String var44 = var10.text; - if (BufferedNetSocket.runCs1(var10)) { - var20 = var10.color2; - if (var10 == VarpDefinition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var44 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == VarpDefinition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var45 = class87.ItemDefinition_get(var10.itemId); - var44 = var45.name; - if (var44 == null) { - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var44 = FloorUnderlayDefinition.colorStartTag(16748608) + var44 + "" + " " + 'x' + class119.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var44 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var44 = SecureRandomFuture.method1952(var44, var10); - } - - 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) { - SpritePixels var40; - if (!var10.isIf3) { - var40 = var10.getSprite(BufferedNetSocket.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field3045) { - class16.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = Actor.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field3045) { - class16.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method7350(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var40.drawTransBgAt(var12, var13); - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var40.method7350(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { - boolean var36 = BufferedNetSocket.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var33 = class87.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 { - class16.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class67.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class67.localPlayer.appearance); - if (var41 == null && Widget.field3045) { - class16.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = KitDefinition.SequenceDefinition_get(var20); - var41 = var10.getModel(var47, var10.modelFrame, var36, class67.localPlayer.appearance); - if (var41 == null && Widget.field3045) { - class16.invalidateWidget(var10); - } - } - - Rasterizer3D.method4122(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.method4454(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method4483(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4454(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field3045) { - class16.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var33 = class87.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = FloorUnderlayDefinition.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = FloorUnderlayDefinition.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class119.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = var13 + (var10.paddingY + 12) * var21; - if (var10.textXAlignment == 0) { - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == PlayerType.field3661 && Client.field557 == Client.field642) { - var19 = 0; - var20 = 0; - Font var31 = class262.fontPlain12; - String var32 = var10.text; - - String var43; - for (var32 = SecureRandomFuture.method1952(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var32.indexOf("
"); - if (var24 != -1) { - var43 = var32.substring(0, var24); - var32 = var32.substring(var24 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var25 = var31.stringWidth(var43); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var32 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var32 = SecureRandomFuture.method1952(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; - var32 = ""; - } - - var31.draw(var43, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field3081) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - HitSplatDefinition.method3162(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } - } + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25 + var1 = new VarpDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); } - } + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 + return var1; // L: 29 + } } + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-67" + ) + static void method2056(int var0) { + Client.oculusOrbState = var0; // L: 12012 + } // L: 12013 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 5a7b29f3ff..4029a088cb 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,168 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("cr") @Implements("AttackOption") public enum AttackOption implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) - field1234(2), - @ObfuscatedName("j") + field1228(2), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) - field1237(4); + field1226(4); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1805660011 + intValue = -495870189 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; - } + this.id = var3; // L: 12076 + } // L: 12077 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 12080 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Lfm;", - garbageValue = "2066190349" + descriptor = "(IB)Lei;", + garbageValue = "99" ) - public static VarbitComposition method2263(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17 if (var1 != null) { return var1; } else { - byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitComposition(); - if (var2 != null) { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { // L: 21 var1.decode(new Buffer(var2)); } - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); + InvDefinition.InvDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkz;I)I", + garbageValue = "-640916313" ) - public static void method2262(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; - } + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + char var7 = 0; // L: 15 + char var8 = 0; // L: 16 - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)Lbc;", - garbageValue = "1817512128" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class386.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1106" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - HealthBarDefinition.method2977(); - PlayerComposition.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - CollisionMap.method3417(2); - Client.currentTrackGroupId = -1; - Client.field663 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; } - if (var1.stream2 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; + if (var6 - var8 >= var4) { + return 1; } - } - ObjectSound.objectSounds.clear(); - UserList.updateGameState(10); - } - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(Ljt;Lfa;IIZI)V", - garbageValue = "-487179567" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; - byte var6 = -1; - String var7 = null; - if (var5 != null && var5[var3] != null) { - if (var3 == 0) { - var6 = 33; - } else if (var3 == 1) { - var6 = 34; - } else if (var3 == 2) { - var6 = 35; - } else if (var3 == 3) { - var6 = 36; + char var9; + if (var7 != 0) { + var9 = var7; // L: 24 + boolean var14 = false; // L: 25 } else { - var6 = 37; + var9 = var0.charAt(var5++); // L: 27 } - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + var7 = class28.method399(var9); // L: 33 + var8 = class28.method399(var10); // L: 34 + var9 = class317.standardizeChar(var9, var2); // L: 35 + var10 = class317.standardizeChar(var10, var2); // L: 36 + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37 + var9 = Character.toLowerCase(var9); // L: 38 + var10 = Character.toLowerCase(var10); // L: 39 + if (var9 != var10) { // L: 40 + return WallDecoration.lowercaseChar(var9, var2) - WallDecoration.lowercaseChar(var10, var2); + } + } } - if (var6 != -1 && var7 != null) { - StructComposition.insertMenuItem(var7, FloorUnderlayDefinition.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + int var16 = Math.min(var3, var4); // L: 43 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 44 + if (var2 == Language.Language_FR) { // L: 45 + var5 = var3 - 1 - var17; // L: 46 + var6 = var4 - 1 - var17; // L: 47 + } else { + var6 = var17; // L: 49 + var5 = var17; + } + + char var11 = var0.charAt(var5); // L: 50 + var12 = var1.charAt(var6); // L: 51 + if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 + var11 = Character.toLowerCase(var11); // L: 53 + var12 = Character.toLowerCase(var12); // L: 54 + if (var12 != var11) { + return WallDecoration.lowercaseChar(var11, var2) - WallDecoration.lowercaseChar(var12, var2); // L: 55 + } + } } + var17 = var3 - var4; // L: 58 + if (var17 != 0) { // L: 59 + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { // L: 60 + var12 = var0.charAt(var18); // L: 61 + char var13 = var1.charAt(var18); // L: 62 + if (var12 != var13) { // L: 63 + return WallDecoration.lowercaseChar(var12, var2) - WallDecoration.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 + } + } + + @ObfuscatedName("w") + static final void method2308(long var0) { + try { + Thread.sleep(var0); // L: 20 + } catch (InterruptedException var3) { // L: 22 + } + + } // L: 23 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1018671860" + ) + static void method2297(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 143 + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 144 + if (var4 != null) { // L: 145 + NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 146 + } + } // L: 147 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "91" + ) + static int method2304(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 84 + boolean var3 = false; // L: 85 + boolean var4 = false; // L: 86 + int var5 = 0; // L: 87 + int var6 = var0.length(); // L: 88 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 89 + char var8 = var0.charAt(var7); // L: 90 + if (var7 == 0) { // L: 91 + if (var8 == '-') { // L: 92 + var3 = true; // L: 93 + continue; + } + + if (var8 == '+') { // L: 96 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 98 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 99 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 100 + throw new NumberFormatException(); // L: 101 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 102 + throw new NumberFormatException(); + } + + if (var3) { // L: 103 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 104 + if (var9 / var1 != var5) { // L: 105 + throw new NumberFormatException(); + } + + var5 = var9; // L: 106 + var4 = true; // L: 107 + } + + if (!var4) { // L: 109 + throw new NumberFormatException(); + } else { + return var5; // L: 110 + } + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 97b93fcc7a..6e73ef65ae 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,157 +3,157 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("ay") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("k") - static float[][] field397; - @ObfuscatedName("t") + @ObfuscatedName("g") + static float[][] field381; + @ObfuscatedName("e") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("a") - static float field399; - @ObfuscatedName("e") + @ObfuscatedName("p") + static float field383; + @ObfuscatedName("j") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("pairs") int[] pairs; - @ObfuscatedName("f") - int[][][] field394; - @ObfuscatedName("j") - int[][][] field395; - @ObfuscatedName("m") - int[] field401; + @ObfuscatedName("s") + int[][][] field387; + @ObfuscatedName("a") + int[][][] field379; + @ObfuscatedName("o") + int[] field384; static { - field397 = new float[2][8]; - coefficients = new int[2][8]; + field381 = new float[2][8]; // L: 13 + coefficients = new int[2][8]; // L: 14 } AudioFilter() { - this.pairs = new int[2]; - this.field394 = new int[2][2][4]; - this.field395 = new int[2][2][4]; - this.field401 = new int[2]; + this.pairs = new int[2]; // L: 8 + this.field387 = new int[2][2][4]; // L: 10 + this.field379 = new int[2][2][4]; // L: 11 + this.field384 = new int[2]; // L: 12 + } // L: 21 + + @ObfuscatedName("i") + float method1067(int var1, int var2, float var3) { + float var4 = (float)this.field379[var1][0][var2] + var3 * (float)(this.field379[var1][1][var2] - this.field379[var1][0][var2]); // L: 24 + var4 *= 0.0015258789F; // L: 25 + return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 } - @ObfuscatedName("l") - float method1026(int var1, int var2, float var3) { - float var4 = (float)this.field395[var1][0][var2] + var3 * (float)(this.field395[var1][1][var2] - this.field395[var1][0][var2]); - var4 *= 0.0015258789F; - return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); + @ObfuscatedName("s") + float method1069(int var1, int var2, float var3) { + float var4 = (float)this.field387[var1][0][var2] + var3 * (float)(this.field387[var1][1][var2] - this.field387[var1][0][var2]); // L: 35 + var4 *= 1.2207031E-4F; // L: 36 + return normalize(var4); // L: 37 } - @ObfuscatedName("f") - float method1028(int var1, int var2, float var3) { - float var4 = (float)this.field394[var1][0][var2] + var3 * (float)(this.field394[var1][1][var2] - this.field394[var1][0][var2]); - var4 *= 1.2207031E-4F; - return normalize(var4); - } - - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("compute") int compute(int var1, float var2) { float var3; - if (var1 == 0) { - var3 = (float)this.field401[0] + (float)(this.field401[1] - this.field401[0]) * var2; - var3 *= 0.0030517578F; - field399 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field399 * 65536.0F); + if (var1 == 0) { // L: 41 + var3 = (float)this.field384[0] + (float)(this.field384[1] - this.field384[0]) * var2; // L: 42 + var3 *= 0.0030517578F; // L: 43 + field383 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field383 * 65536.0F); // L: 45 } - if (this.pairs[var1] == 0) { + if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1026(var1, 0, var2); - field397[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1028(var1, 0, var2)); - field397[var1][1] = var3 * var3; + var3 = this.method1067(var1, 0, var2); // L: 48 + field381[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1069(var1, 0, var2)); // L: 49 + field381[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method1026(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1028(var1, var4, var2)); - float var6 = var3 * var3; - field397[var1][var4 * 2 + 1] = field397[var1][var4 * 2 - 1] * var6; - field397[var1][var4 * 2] = field397[var1][var4 * 2 - 1] * var5 + field397[var1][var4 * 2 - 2] * var6; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 + var3 = this.method1067(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1069(var1, var4, var2)); // L: 53 + float var6 = var3 * var3; // L: 54 + field381[var1][var4 * 2 + 1] = field381[var1][var4 * 2 - 1] * var6; // L: 55 + field381[var1][var4 * 2] = field381[var1][var4 * 2 - 1] * var5 + field381[var1][var4 * 2 - 2] * var6; // L: 56 - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field397[var1]; - var10000[var7] += field397[var1][var7 - 1] * var5 + field397[var1][var7 - 2] * var6; + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 + var10000 = field381[var1]; + var10000[var7] += field381[var1][var7 - 1] * var5 + field381[var1][var7 - 2] * var6; } - var10000 = field397[var1]; - var10000[1] += field397[var1][0] * var5 + var6; - var10000 = field397[var1]; + var10000 = field381[var1]; // L: 58 + var10000[1] += field381[var1][0] * var5 + var6; + var10000 = field381[var1]; // L: 59 var10000[0] += var5; } - if (var1 == 0) { + if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field397[0]; - var10000[var4] *= field399; + var10000 = field381[0]; + var10000[var4] *= field383; } } - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field397[var1][var4] * 65536.0F); + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 + coefficients[var1][var4] = (int)(field381[var1][var4] * 65536.0F); } - return this.pairs[var1] * 2; + return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lot;Lar;)V" + descriptor = "(Lop;Lab;)V" ) - final void method1029(Buffer var1, SoundEnvelope var2) { - int var3 = var1.readUnsignedByte(); - this.pairs[0] = var3 >> 4; - this.pairs[1] = var3 & 15; - if (var3 != 0) { - this.field401[0] = var1.readUnsignedShort(); - this.field401[1] = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); + final void method1082(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.field384[0] = var1.readUnsignedShort(); // L: 71 + this.field384[1] = var1.readUnsignedShort(); // L: 72 + int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; - for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field394[var5][0][var6] = var1.readUnsignedShort(); - this.field395[var5][0][var6] = var1.readUnsignedShort(); + for (var5 = 0; var5 < 2; ++var5) { // L: 74 + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 + this.field387[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field379[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } - for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - if ((var7 & 1 << var5 * 4 << var6) != 0) { - this.field394[var5][1][var6] = var1.readUnsignedShort(); - this.field395[var5][1][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.field387[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field379[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field394[var5][1][var6] = this.field394[var5][0][var6]; - this.field395[var5][1][var6] = this.field395[var5][0][var6]; + this.field387[var5][1][var6] = this.field387[var5][0][var6]; // L: 87 + this.field379[var5][1][var6] = this.field379[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field401[1] != this.field401[0]) { + if (var7 != 0 || this.field384[1] != this.field384[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field401; - this.field401[1] = 0; - var4[0] = 0; + int[] var4 = this.field384; // L: 95 + this.field384[1] = 0; // L: 96 + var4[0] = 0; // L: 97 } - } + } // L: 99 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("normalize") static float normalize(float var0) { - float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); - return var1 * 3.1415927F / 11025.0F; + float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 + return var1 * 3.1415927F / 11025.0F; // L: 31 } } diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 92ba41b95f..f8ad9a13c0 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,129 +3,129 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") +@ObfuscatedName("ol") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Lof;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { - BZip2Decompressor_state = new BZip2State(); + BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { - 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.field4307 = 0; - BZip2Decompressor_decompress(BZip2Decompressor_state); - var1 -= BZip2Decompressor_state.outputLength; - BZip2Decompressor_state.inputArray = null; - BZip2Decompressor_state.outputArray = null; - return var1; + 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.field4303 = 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 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Lof;)V" ) - static void method7132(BZip2State var0) { - byte var2 = var0.out_char; - int var3 = var0.su_rNToGo; - int var4 = var0.nblocks_used; - int var5 = var0.su_ch2; - int[] var6 = AbstractUserComparator.BZip2Decompressor_block; - int var7 = var0.field4314; - byte[] var8 = var0.outputArray; - int var9 = var0.next_out; - int var10 = var0.outputLength; - int var12 = var0.field4300 + 1; + static void method7207(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 = class300.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4322; // L: 45 + byte[] var8 = var0.outputArray; // L: 46 + int var9 = var0.next_out; // L: 47 + int var10 = var0.outputLength; // L: 48 + int var12 = var0.field4326 + 1; // L: 50 label70: while (true) { - if (var3 > 0) { + if (var3 > 0) { // L: 53 while (true) { - if (var10 == 0) { + if (var10 == 0) { // L: 55 break label70; } - if (var3 == 1) { - if (var10 == 0) { - var3 = 1; + if (var3 == 1) { // L: 56 + if (var10 == 0) { // L: 62 + var3 = 1; // L: 63 break label70; } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 66 + ++var9; // L: 67 + --var10; // L: 68 break; } - var8[var9] = var2; - --var3; - ++var9; - --var10; + var8[var9] = var2; // L: 57 + --var3; // L: 58 + ++var9; // L: 59 + --var10; // L: 60 } } - 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; + 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 } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 86 + ++var9; // L: 87 + --var10; // L: 88 } else { - if (var4 != var12) { - var3 = 2; - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - if (var4 != var12) { - if (var1 != var5) { - var5 = var1; + 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 } else { - var3 = 3; - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - if (var4 != var12) { - if (var1 != var5) { - var5 = var1; + 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 } else { - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - var3 = (var1 & 255) + 4; - var7 = var6[var7]; - var5 = (byte)var7; - var7 >>= 8; - ++var4; + 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 } } } @@ -133,508 +133,508 @@ public final class BZip2Decompressor { continue label70; } - if (var10 == 0) { - var3 = 1; - break label70; + if (var10 == 0) { // L: 92 + var3 = 1; // L: 93 + break label70; // L: 94 } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 96 + ++var9; // L: 97 + --var10; // L: 98 } } - var3 = 0; - break; + var3 = 0; // L: 72 + break; // L: 73 } - int var13 = var0.field4307; - var0.field4307 += var10 - var10; - if (var0.field4307 < var13) { + int var13 = var0.field4303; // L: 133 + var0.field4303 += var10 - var10; // L: 134 + if (var0.field4303 < var13) { // L: 135 } - var0.out_char = var2; - var0.su_rNToGo = var3; - var0.nblocks_used = var4; - var0.su_ch2 = var5; - AbstractUserComparator.BZip2Decompressor_block = var6; - var0.field4314 = var7; - var0.outputArray = var8; - var0.next_out = var9; - var0.outputLength = var10; - } + var0.out_char = var2; // L: 136 + var0.su_rNToGo = var3; // L: 137 + var0.nblocks_used = var4; // L: 138 + var0.su_ch2 = var5; // L: 139 + class300.BZip2Decompressor_block = var6; // L: 140 + var0.field4322 = var7; // L: 141 + var0.outputArray = var8; // L: 142 + var0.next_out = var9; // L: 143 + var0.outputLength = var10; // L: 144 + } // L: 145 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Lof;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { - 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 = -1272899535; - if (AbstractUserComparator.BZip2Decompressor_block == null) { - AbstractUserComparator.BZip2Decompressor_block = new int[var0.blockSize100k * -800659296]; + 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 = -1020212041; // L: 173 + if (class300.BZip2Decompressor_block == null) { // L: 174 + class300.BZip2Decompressor_block = new int[var0.blockSize100k * -262975904]; } - boolean var26 = true; + boolean var26 = true; // L: 175 while (true) { while (var26) { - byte var1 = BZip2Decompressor_readNextByte(var0); - if (var1 == 23) { + byte var1 = BZip2Decompressor_readNextByte(var0); // L: 177 + if (var1 == 23) { // L: 178 return; } - 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) { + 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 } - 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; + 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 int var36; - for (var36 = 0; var36 < 16; ++var36) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 1) { + for (var36 = 0; var36 < 16; ++var36) { // L: 198 + var1 = BZip2Decompressor_readNextBit(var0); // L: 199 + if (var1 == 1) { // L: 200 var0.inUse16[var36] = true; } else { - var0.inUse16[var36] = false; + var0.inUse16[var36] = false; // L: 201 } } - for (var36 = 0; var36 < 256; ++var36) { + for (var36 = 0; var36 < 256; ++var36) { // L: 203 var0.inUse[var36] = false; } int var37; - for (var36 = 0; var36 < 16; ++var36) { - if (var0.inUse16[var36]) { - for (var37 = 0; var37 < 16; ++var37) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 1) { + 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 var0.inUse[var37 + var36 * 16] = true; } } } } - makeMaps(var0); - int var39 = var0.nInUse + 2; - int var40 = BZip2Decompressor_readBits(3, var0); - int var41 = BZip2Decompressor_readBits(15, var0); + 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 - for (var36 = 0; var36 < var41; ++var36) { - var37 = 0; + for (var36 = 0; var36 < var41; ++var36) { // L: 216 + var37 = 0; // L: 217 while (true) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { - var0.selectorMtf[var36] = (byte)var37; + var1 = BZip2Decompressor_readNextBit(var0); // L: 219 + if (var1 == 0) { // L: 220 + var0.selectorMtf[var36] = (byte)var37; // L: 223 break; } - ++var37; + ++var37; // L: 221 } } - byte[] var27 = new byte[6]; + byte[] var27 = new byte[6]; // L: 226 byte var29; - for (var29 = 0; var29 < var40; var27[var29] = var29++) { + for (var29 = 0; var29 < var40; var27[var29] = var29++) { // L: 229 } - for (var36 = 0; var36 < var41; ++var36) { - var29 = var0.selectorMtf[var36]; + for (var36 = 0; var36 < var41; ++var36) { // L: 230 + var29 = var0.selectorMtf[var36]; // L: 231 byte var28; - for (var28 = var27[var29]; var29 > 0; --var29) { - var27[var29] = var27[var29 - 1]; + for (var28 = var27[var29]; var29 > 0; --var29) { // L: 232 233 235 + var27[var29] = var27[var29 - 1]; // L: 234 } - var27[0] = var28; - var0.selector[var36] = var28; + var27[0] = var28; // L: 237 + var0.selector[var36] = var28; // L: 238 } int var38; - for (var38 = 0; var38 < var40; ++var38) { - int var50 = BZip2Decompressor_readBits(5, var0); + for (var38 = 0; var38 < var40; ++var38) { // L: 241 + int var50 = BZip2Decompressor_readBits(5, var0); // L: 242 - for (var36 = 0; var36 < var39; ++var36) { + for (var36 = 0; var36 < var39; ++var36) { // L: 243 while (true) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { - var0.temp_charArray2d[var38][var36] = (byte)var50; + var1 = BZip2Decompressor_readNextBit(var0); // L: 245 + if (var1 == 0) { // L: 246 + var0.temp_charArray2d[var38][var36] = (byte)var50; // L: 251 break; } - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { + var1 = BZip2Decompressor_readNextBit(var0); // L: 247 + if (var1 == 0) { // L: 248 ++var50; } else { - --var50; + --var50; // L: 249 } } } } - for (var38 = 0; var38 < var40; ++var38) { - byte var2 = 32; - byte var3 = 0; + for (var38 = 0; var38 < var40; ++var38) { // L: 254 + byte var2 = 32; // L: 255 + byte var3 = 0; // L: 256 - for (var36 = 0; var36 < var39; ++var36) { - if (var0.temp_charArray2d[var38][var36] > var3) { + for (var36 = 0; var36 < var39; ++var36) { // L: 257 + if (var0.temp_charArray2d[var38][var36] > var3) { // L: 258 var3 = var0.temp_charArray2d[var38][var36]; } - if (var0.temp_charArray2d[var38][var36] < var2) { + if (var0.temp_charArray2d[var38][var36] < var2) { // L: 259 var2 = var0.temp_charArray2d[var38][var36]; } } - BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); - var0.minLens[var38] = var2; + 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 } - int var42 = var0.nInUse + 1; - int var43 = -1; - byte var44 = 0; + int var42 = var0.nInUse + 1; // L: 264 + int var43 = -1; // L: 265 + byte var44 = 0; // L: 266 - for (var36 = 0; var36 <= 255; ++var36) { + for (var36 = 0; var36 <= 255; ++var36) { // L: 267 var0.unzftab[var36] = 0; } - int var56 = 4095; + int var56 = 4095; // L: 272 int var35; int var55; - for (var35 = 15; var35 >= 0; --var35) { - for (var55 = 15; var55 >= 0; --var55) { - var0.ll8[var56] = (byte)(var55 + var35 * 16); - --var56; + 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 } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 278 } - int var47 = 0; + int var47 = 0; // L: 281 byte var54; - 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]; + 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 } - int var45 = var44 - 1; - int var51 = var22; + int var45 = var44 - 1; // L: 291 + int var51 = var22; // L: 292 int var52; byte var53; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + 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 } - int var46 = var25[var52 - var24[var51]]; + int var46 = var25[var52 - var24[var51]]; // L: 300 while (true) { int[] var10000; int var10002; - while (var46 != var42) { - if (var46 != 0 && var46 != 1) { - int var33 = var46 - 1; + while (var46 != var42) { // L: 302 + if (var46 != 0 && var46 != 1) { // L: 303 + int var33 = var46 - 1; // L: 349 int var30; - if (var33 < 16) { - var30 = var0.getAndMoveToFrontDecode_yy[0]; + if (var33 < 16) { // L: 350 + var30 = var0.getAndMoveToFrontDecode_yy[0]; // L: 351 - 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]; + 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 } - while (var33 > 0) { - var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; - --var33; + while (var33 > 0) { // L: 361 + var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; // L: 362 + --var33; // L: 363 } - var0.ll8[var30] = var1; + var0.ll8[var30] = var1; // L: 365 } else { - int var31 = var33 / 16; - int var32 = var33 % 16; - var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; + int var31 = var33 / 16; // L: 368 + int var32 = var33 % 16; // L: 369 + var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; // L: 370 - for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { - var0.ll8[var30] = var0.ll8[var30 - 1]; + 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 (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]; + 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 } - var10002 = var0.getAndMoveToFrontDecode_yy[0]--; - var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; - if (var0.getAndMoveToFrontDecode_yy[0] == 0) { - var56 = 4095; + 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 - for (var35 = 15; var35 >= 0; --var35) { - for (var55 = 15; var55 >= 0; --var55) { - var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; - --var56; + 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 } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 391 } } } - var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - AbstractUserComparator.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]; + var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 + class300.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 } - --var45; - var51 = var22; + --var45; // L: 408 + var51 = var22; // L: 409 - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + 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 } - var46 = var25[var52 - var24[var51]]; + var46 = var25[var52 - var24[var51]]; // L: 417 } else { - int var48 = -1; - int var49 = 1; + int var48 = -1; // L: 304 + int var49 = 1; // L: 305 do { - if (var46 == 0) { + if (var46 == 0) { // L: 307 var48 += var49; - } else if (var46 == 1) { + } else if (var46 == 1) { // L: 308 var48 += var49 * 2; } - 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]; + 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 } - --var45; - var51 = var22; + --var45; // L: 319 + var51 = var22; // L: 320 - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + 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 } - var46 = var25[var52 - var24[var51]]; - } while(var46 == 0 || var46 == 1); + var46 = var25[var52 - var24[var51]]; // L: 328 + } while(var46 == 0 || var46 == 1); // L: 329 - ++var48; - var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; - var10000 = var0.unzftab; + ++var48; // L: 330 + var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; // L: 331 + var10000 = var0.unzftab; // L: 332 - for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - AbstractUserComparator.BZip2Decompressor_block[var47] = var1 & 255; - ++var47; + for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 + class300.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + ++var47; // L: 335 } } } - var0.su_rNToGo = 0; - var0.out_char = 0; - var0.cftab[0] = 0; + var0.su_rNToGo = 0; // L: 421 + var0.out_char = 0; // L: 422 + var0.cftab[0] = 0; // L: 423 - for (var36 = 1; var36 <= 256; ++var36) { + for (var36 = 1; var36 <= 256; ++var36) { // L: 424 var0.cftab[var36] = var0.unzftab[var36 - 1]; } - for (var36 = 1; var36 <= 256; ++var36) { + for (var36 = 1; var36 <= 256; ++var36) { // L: 425 var10000 = var0.cftab; var10000[var36] += var0.cftab[var36 - 1]; } - for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(AbstractUserComparator.BZip2Decompressor_block[var36] & 255); - var10000 = AbstractUserComparator.BZip2Decompressor_block; + for (var36 = 0; var36 < var47; ++var36) { // L: 426 + var1 = (byte)(class300.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class300.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; - var10002 = var0.cftab[var1 & 255]++; + var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4314 = AbstractUserComparator.BZip2Decompressor_block[var0.originalPointer] >> 8; - var0.nblocks_used = 0; - var0.field4314 = AbstractUserComparator.BZip2Decompressor_block[var0.field4314]; - var0.su_ch2 = (byte)(var0.field4314 & 255); - var0.field4314 >>= 8; - ++var0.nblocks_used; - var0.field4300 = var47; - method7132(var0); - if (var0.field4300 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4322 = class300.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.nblocks_used = 0; // L: 432 + var0.field4322 = class300.BZip2Decompressor_block[var0.field4322]; // L: 433 + var0.su_ch2 = (byte)(var0.field4322 & 255); // L: 434 + var0.field4322 >>= 8; // L: 436 + ++var0.nblocks_used; // L: 437 + var0.field4326 = var47; // L: 438 + method7207(var0); // L: 439 + if (var0.field4326 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } - var26 = false; + var26 = false; // L: 441 break; } } - return; + return; // L: 443 } } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Loe;)B" - ) - @Export("BZip2Decompressor_readNextByte") - static byte BZip2Decompressor_readNextByte(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(8, var0); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Loe;)B" - ) - @Export("BZip2Decompressor_readNextBit") - static byte BZip2Decompressor_readNextBit(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(1, var0); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILoe;)I" - ) - @Export("BZip2Decompressor_readBits") - static int BZip2Decompressor_readBits(int var0, BZip2State var1) { - 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; - var1.bsLive -= var0; - return var2; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Loe;)V" - ) - @Export("makeMaps") - static void makeMaps(BZip2State var0) { - var0.nInUse = 0; - - for (int var1 = 0; var1 < 256; ++var1) { - if (var0.inUse[var1]) { - var0.seqToUnseq[var0.nInUse] = (byte)var1; - ++var0.nInUse; - } - } - - } - @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lof;)B" + ) + @Export("BZip2Decompressor_readNextByte") + static byte BZip2Decompressor_readNextByte(BZip2State var0) { + return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lof;)B" + ) + @Export("BZip2Decompressor_readNextBit") + static byte BZip2Decompressor_readNextBit(BZip2State var0) { + return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILof;)I" + ) + @Export("BZip2Decompressor_readBits") + static int BZip2Decompressor_readBits(int var0, BZip2State var1) { + while (var1.bsLive < var0) { // L: 456 + var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 + var1.bsLive += 8; // L: 463 + ++var1.nextByte; // L: 464 + ++var1.nextBit_unused; // L: 465 + if (var1.nextBit_unused == 0) { // L: 466 + } + } + + int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; // L: 458 + var1.bsLive -= var0; // L: 459 + return var2; // L: 460 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lof;)V" + ) + @Export("makeMaps") + static void makeMaps(BZip2State var0) { + var0.nInUse = 0; // L: 472 + + 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 + } + } + + } // L: 479 + + @ObfuscatedName("p") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { - int var7 = 0; + int var7 = 0; // L: 486 int var8; - for (var8 = var4; var8 <= var5; ++var8) { - for (int var9 = 0; var9 < var6; ++var9) { - if (var8 == var3[var9]) { - var2[var7] = var9; - ++var7; + 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 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { // L: 495 var1[var8] = 0; } - for (var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { // L: 496 ++var1[var3[var8] + 1]; } - for (var8 = 1; var8 < 23; ++var8) { + for (var8 = 1; var8 < 23; ++var8) { // L: 497 var1[var8] += var1[var8 - 1]; } - for (var8 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { // L: 498 var0[var8] = 0; } - int var10 = 0; + int var10 = 0; // L: 499 - for (var8 = var4; var8 <= var5; ++var8) { - var10 += var1[var8 + 1] - var1[var8]; - var0[var8] = var10 - 1; - var10 <<= 1; + 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 + 1; var8 <= var5; ++var8) { - var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; + for (var8 = var4 + 1; var8 <= var5; ++var8) { // L: 505 + var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; // L: 506 } - } + } // L: 508 } diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index e0321463c6..21dbd539eb 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,171 +2,173 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("oe") +@ObfuscatedName("of") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("l") - final int field4321; - @ObfuscatedName("q") - final int field4301; - @ObfuscatedName("f") - final int field4297; - @ObfuscatedName("j") - final int field4298; - @ObfuscatedName("m") - final int field4324; - @ObfuscatedName("k") - final int field4327; - @ObfuscatedName("t") + @ObfuscatedName("i") + final int field4325; + @ObfuscatedName("w") + final int field4304; + @ObfuscatedName("s") + final int field4305; + @ObfuscatedName("a") + final int field4306; + @ObfuscatedName("o") + final int field4334; + @ObfuscatedName("g") + final int field4315; + @ObfuscatedName("e") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -423791867 + intValue = -384998697 ) @Export("nextByte") int nextByte; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -35036943 + intValue = -1728715717 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -274929017 + intValue = -1596993239 ) @Export("next_out") int next_out; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1396633921 + intValue = 292759791 ) @Export("outputLength") int outputLength; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1637458191 + intValue = -669806993 ) - int field4307; - @ObfuscatedName("v") + int field4303; + @ObfuscatedName("t") @Export("out_char") byte out_char; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -19931269 + intValue = 234713663 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2147042251 + intValue = 895907887 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1165324025 + intValue = -2081618431 ) @Export("bsLive") int bsLive; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1252638347 + intValue = 2138397069 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2144945391 + intValue = 1184456773 ) - int field4314; - @ObfuscatedName("h") + int field4322; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1948961563 + intValue = 159330307 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("unzftab") int[] unzftab; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -194089085 + intValue = 1103656879 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("cftab") int[] cftab; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -305631671 + intValue = -1576280253 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("ll8") byte[] ll8; - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("selector") byte[] selector; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("limit") int[][] limit; - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("base") int[][] base; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @Export("perm") int[][] perm; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("minLens") int[] minLens; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1097508377 + intValue = -138275331 ) - int field4300; + int field4326; BZip2State() { - this.field4321 = 4096; - this.field4301 = 16; - this.field4297 = 258; - this.field4298 = 6; - this.field4324 = 50; - this.field4327 = 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.field4325 = 4096; // L: 4 + this.field4304 = 16; // L: 5 + this.field4305 = 258; // L: 6 + this.field4306 = 6; // L: 7 + this.field4334 = 50; // L: 8 + this.field4315 = 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]; this.ll8 = new byte[4096]; this.getAndMoveToFrontDecode_yy = new int[16]; @@ -175,7 +177,91 @@ public final class BZip2State { 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]; + this.perm = new int[6][258]; // L: 40 + this.minLens = new int[6]; // L: 41 + } // L: 44 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Lfh;", + garbageValue = "-360258293" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 + var1 = new SpotAnimationDefinition(); // L: 35 + var1.id = var0; // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILbp;ZB)I", + garbageValue = "0" + ) + static int method7179(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 566 + Widget var4; + if (var0 >= 2000) { // L: 568 + var0 -= 1000; // L: 569 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 570 + var4 = UserComparator9.getWidget(var3); // L: 571 + } else { + var4 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 573 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 574 + class14.Interpreter_intStackSize -= 4; // L: 575 + var4.rawX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 576 + var4.rawY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 577 + var4.xAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 578 + var4.yAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 579 + class184.invalidateWidget(var4); // L: 580 + ArchiveLoader.client.alignWidget(var4); // L: 581 + if (var3 != -1 && var4.type == 0) { // L: 582 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 583 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 585 + class14.Interpreter_intStackSize -= 4; // L: 586 + var4.rawWidth = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 587 + var4.rawHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 588 + var4.widthAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 589 + var4.heightAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 590 + class184.invalidateWidget(var4); // L: 591 + ArchiveLoader.client.alignWidget(var4); // L: 592 + if (var3 != -1 && var4.type == 0) { // L: 593 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 594 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 596 + boolean var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 597 + if (var5 != var4.isHidden) { // L: 598 + var4.isHidden = var5; // L: 599 + class184.invalidateWidget(var4); // L: 600 + } + + return 1; // L: 602 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 604 + var4.noClickThrough = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 605 + return 1; // L: 606 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 608 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 609 + return 1; // L: 610 + } else { + return 2; // L: 612 + } } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index cf8e3baa05..a6790592f6 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,72 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hb") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("bw") + @ObfuscatedName("bm") + static String field2618; + @ObfuscatedName("hi") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "Low;" ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("l") + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1376484179 + intValue = -1005985993 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -604518039 + intValue = -906574175 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -129447381 + intValue = -405320811 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1366610135 + intValue = -989748679 ) @Export("orientationA") int orientationA; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -488074781 + intValue = -278128521 ) @Export("orientationB") int orientationB; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -3701872394330512717L + longValue = 4551271496275992869L ) @Export("tag") public long tag; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1201244349 + intValue = 709360475 ) @Export("flags") int flags; BoundaryObject() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 11 + this.flags = 0; // L: 12 + } // L: 14 } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 880926b338..6297f16ada 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -3,217 +3,194 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("me") +@ObfuscatedName("mo") @Implements("Bounds") public class Bounds { - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 381573943 - ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1695480497 + intValue = -1843320923 ) @Export("lowX") public int lowX; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2043874087 + intValue = 1031650591 ) @Export("lowY") public int lowY; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1088708309 + intValue = -1371710773 ) @Export("highX") public int highX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1526054429 + intValue = -179878711 ) @Export("highY") public int highY; public Bounds(int var1, int var2, int var3, int var4) { - this.setLow(var1, var2); - this.setHigh(var3, var4); - } + this.setLow(var1, var2); // L: 14 + this.setHigh(var3, var4); // L: 15 + } // L: 16 public Bounds(int var1, int var2) { - this(0, 0, var1, var2); - } + this(0, 0, var1, var2); // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-104" + descriptor = "(IIS)V", + garbageValue = "7696" ) @Export("setLow") public void setLow(int var1, int var2) { - this.lowX = var1; - this.lowY = var2; - } + this.lowX = var1; // L: 19 + this.lowY = var2; // L: 20 + } // L: 21 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1084787659" + descriptor = "(IIB)V", + garbageValue = "101" ) @Export("setHigh") public void setHigh(int var1, int var2) { - this.highX = var1; - this.highY = var2; - } + this.highX = var1; // L: 24 + this.highY = var2; // L: 25 + } // L: 26 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "1" + descriptor = "(III)Z", + garbageValue = "-1805672690" ) - public boolean method6252(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lme;Lme;B)V", - garbageValue = "-83" - ) - public void method6253(Bounds var1, Bounds var2) { - this.method6254(var1, var2); - this.method6255(var1, var2); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lme;Lme;I)V", - garbageValue = "348652438" - ) - void method6254(Bounds var1, Bounds var2) { - var2.lowX = this.lowX; - var2.highX = this.highX; - if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 1746135677 - (var1.lowX * 1746135677 - this.lowX * 1746135677)) * 1088708309; - var2.lowX = var1.lowX; - } - - if (var2.method6261() > var1.method6261()) { - var2.highX -= var2.method6261() - var1.method6261(); - } - - if (var2.highX < 0) { - var2.highX = 0; - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lme;Lme;I)V", - garbageValue = "-1307701486" - ) - void method6255(Bounds var1, Bounds var2) { - var2.lowY = this.lowY; - var2.highY = this.highY; - if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * 98366517 - (var1.lowY * 98366517 - this.lowY * 98366517)) * 1526054429; - var2.lowY = var1.lowY; - } - - if (var2.method6257() > var1.method6257()) { - var2.highY -= var2.method6257() - var1.method6257(); - } - - if (var2.highY < 0) { - var2.highY = 0; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1298580692" - ) - int method6261() { - return this.highX + this.lowX; + public boolean method6341(int var1, int var2) { + return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29 } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-108" + descriptor = "(Lmo;Lmo;I)V", + garbageValue = "-1080090251" ) - int method6257() { - return this.highY + this.lowY; + public void method6353(Bounds var1, Bounds var2) { + this.method6343(var1, var2); // L: 37 + this.method6344(var1, var2); // L: 38 + } // L: 39 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lmo;Lmo;I)V", + garbageValue = "-953724915" + ) + void method6343(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 * -373048605 - (var1.lowX * -373048605 - this.lowX * -373048605)) * -1371710773; // L: 45 + var2.lowX = var1.lowX; // L: 46 + } + + if (var2.method6345() > var1.method6345()) { // L: 48 + var2.highX -= var2.method6345() - var1.method6345(); // L: 49 + } + + if (var2.highX < 0) { // L: 51 + var2.highX = 0; + } + + } // L: 52 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lmo;Lmo;B)V", + garbageValue = "107" + ) + void method6344(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 * -447998599 - (var1.lowY * -447998599 - this.lowY * -447998599)) * -179878711; // L: 58 + var2.lowY = var1.lowY; // L: 59 + } + + if (var2.method6369() > var1.method6369()) { // L: 61 + var2.highY -= var2.method6369() - var1.method6369(); // L: 62 + } + + if (var2.highY < 0) { // L: 64 + var2.highY = 0; + } + + } // L: 65 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-123662248" + ) + int method6345() { + return this.lowX + this.highX; // L: 68 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "539098241" + ) + int method6369() { + return this.highY + this.lowY; // L: 72 } public String toString() { - return null; + return null; // L: 33 } - @ObfuscatedName("v") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "1" + descriptor = "(B)V", + garbageValue = "-113" ) - static int method6262(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 1615 && var0 != 1616) { - return 2; - } else { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; + static void method6370() { + Client.packetWriter.clearBuffer(); // L: 3043 + Client.packetWriter.packetBuffer.offset = 0; // L: 3044 + Client.packetWriter.serverPacket = null; // L: 3045 + Client.packetWriter.field1277 = null; // L: 3046 + Client.packetWriter.field1284 = null; // L: 3047 + Client.packetWriter.field1285 = null; // L: 3048 + Client.packetWriter.serverPacketLength = 0; // L: 3049 + Client.packetWriter.field1275 = 0; // L: 3050 + Client.rebootTimer = 0; // L: 3051 + KeyHandler.method343(); // L: 3052 + Client.minimapState = 0; // L: 3053 + Client.destinationX = 0; // L: 3054 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 3055 + Client.players[var0] = null; } - } + + HealthBarDefinition.localPlayer = null; // L: 3056 + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 3057 + NPC var1 = Client.npcs[var0]; // L: 3058 + if (var1 != null) { // L: 3059 + var1.targetIndex = -1; // L: 3060 + var1.false0 = false; // L: 3061 + } + } + + GrandExchangeOfferUnitPriceComparator.method5485(); // L: 3064 + WorldMapData_1.updateGameState(30); // L: 3065 + + for (var0 = 0; var0 < 100; ++var0) { // L: 3066 + Client.field594[var0] = true; + } + + Frames.method4481(); // L: 3067 + } // L: 3068 } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index db8469a527..5e59affed4 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,75 +1,63 @@ -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("mt") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -977331453 + intValue = -1034960897 ) @Export("world") public int world; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 245467125 + intValue = -641382841 ) @Export("int2") public int int2; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1269948007 + intValue = 1056150373 ) @Export("rank") public int rank; Buddy() { - this.world = -1; - } + this.world = -1; // L: 4 + } // L: 8 - @ObfuscatedName("aq") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1337027994" + garbageValue = "1899366567" ) @Export("set") void set(int var1, int var2) { - this.world = var1; - this.int2 = var2; - } + this.world = var1; // L: 11 + this.int2 = var2; // L: 12 + } // L: 13 - @ObfuscatedName("ar") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-932484289" + garbageValue = "-2060140127" ) @Export("getWorld") public int getWorld() { - return this.world; + return this.world; // L: 16 } - @ObfuscatedName("ac") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1790941818" + descriptor = "(B)Z", + garbageValue = "-28" ) @Export("hasWorld") public boolean hasWorld() { - return this.world > 0; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-942544363" - ) - static SecureRandom method6152() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; + return this.world > 0; // L: 20 } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 500214bd63..6dfc7c0893 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,54 +1,104 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dn") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("w") + @ObfuscatedName("rd") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Las;" ) - @Export("musicTrack") - public static MusicTrack musicTrack; + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("sn") + @ObfuscatedGetter( + intValue = 31962043 + ) + static int field1333; @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Leb;" - ) - static ClanChannel field1347; - @ObfuscatedName("l") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "-940164438" + descriptor = "(Lmt;Lmt;B)I", + garbageValue = "1" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.rank != var1.rank) { - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; + if (var2.rank != var1.rank) { // L: 14 + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(Lko;III)Z", + garbageValue = "2134321189" ) - public static int method2458() { - return ViewportMouse.ViewportMouse_entityCount; + public static boolean method2502(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 208 + if (var3 == null) { // L: 209 + return false; + } else { + Script.SpriteBuffer_decode(var3); // L: 210 + return true; // L: 211 + } + } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "459" + ) + static void method2500() { + int var0 = Players.Players_count; // L: 5051 + int[] var1 = Players.Players_indices; // L: 5052 + + for (int var2 = 0; var2 < var0; ++var2) { // L: 5053 + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 5054 + class132.addPlayerToScene(Client.players[var1[var2]], true); // L: 5055 + } + } + + } // L: 5057 + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(Ljf;I)Ljf;", + garbageValue = "1540120138" + ) + static Widget method2501(Widget var0) { + int var2 = PendingSpawn.getWidgetFlags(var0); // L: 11886 + int var1 = var2 >> 17 & 7; // L: 11888 + int var3 = var1; // L: 11890 + if (var1 == 0) { // L: 11891 + return null; + } else { + for (int var4 = 0; var4 < var3; ++var4) { // L: 11892 + var0 = UserComparator9.getWidget(var0.parentId); // L: 11893 + if (var0 == null) { // L: 11894 + return null; + } + } + + return var0; // L: 11896 + } } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 161b1cd5d4..f19e7a4215 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,34 +5,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ot") +@ObfuscatedName("op") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("array") public byte[] array; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -516434189 + intValue = 1120023427 ) @Export("offset") public int offset; static { - crc32Table = new int[256]; + crc32Table = new int[256]; // L: 16 int var2; - for (int var1 = 0; var1 < 256; ++var1) { - int var4 = var1; + for (int var1 = 0; var1 < 256; ++var1) { // L: 21 + int var4 = var1; // L: 22 - for (var2 = 0; var2 < 8; ++var2) { - if ((var4 & 1) == 1) { + for (var2 = 0; var2 < 8; ++var2) { // L: 23 + if ((var4 & 1) == 1) { // L: 24 var4 = var4 >>> 1 ^ -306674912; } else { var4 >>>= 1; @@ -44,999 +44,1077 @@ public class Buffer extends Node { crc64Table = new long[256]; - for (var2 = 0; var2 < 256; ++var2) { - long var0 = (long)var2; + for (var2 = 0; var2 < 256; ++var2) { // L: 36 + long var0 = (long)var2; // L: 37 - for (int var3 = 0; var3 < 8; ++var3) { - if (1L == (var0 & 1L)) { + for (int var3 = 0; var3 < 8; ++var3) { // L: 38 + if (1L == (var0 & 1L)) { // L: 39 var0 = var0 >>> 1 ^ -3932672073523589310L; } else { - var0 >>>= 1; + var0 >>>= 1; // L: 40 } } - crc64Table[var2] = var0; + crc64Table[var2] = var0; // L: 42 } - } + } // L: 44 public Buffer(int var1) { - this.array = Varps.ByteArrayPool_getArray(var1); - this.offset = 0; - } + this.array = class194.ByteArrayPool_getArray(var1); // L: 69 + this.offset = 0; // L: 70 + } // L: 71 public Buffer(byte[] var1) { - this.array = var1; - this.offset = 0; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2080876546" - ) - @Export("releaseArray") - public void releaseArray() { - if (this.array != null) { - class279.ByteArrayPool_release(this.array); - } - - this.array = null; - } + this.array = var1; // L: 74 + this.offset = 0; // L: 75 + } // L: 76 @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "75" + ) + @Export("releaseArray") + public void releaseArray() { + if (this.array != null) { // L: 79 + InvDefinition.ByteArrayPool_release(this.array); + } + + this.array = null; // L: 80 + } // L: 81 + + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1976436256" + garbageValue = "1682380921" ) @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)var1; // L: 84 + } // L: 85 - @ObfuscatedName("ac") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-72" + descriptor = "(II)V", + garbageValue = "-1867178833" ) @Export("writeShort") public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "14" - ) - @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88 + this.array[++this.offset - 1] = (byte)var1; // L: 89 + } // L: 90 @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2050361776" + descriptor = "(IB)V", + garbageValue = "52" + ) + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 93 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 94 + this.array[++this.offset - 1] = (byte)var1; // L: 95 + } // L: 96 + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "28" ) @Export("writeInt") public void writeInt(int var1) { - 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("an") - @Export("writeLongMedium") - public void writeLongMedium(long var1) { - 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("av") - @Export("writeLong") - public void writeLong(long var1) { - 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); - } + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 99 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 100 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 101 + this.array[++this.offset - 1] = (byte)var1; // L: 102 + } // L: 103 @ObfuscatedName("ap") + @Export("writeLongMedium") + public void writeLongMedium(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 111 + } // L: 112 + + @ObfuscatedName("au") + @Export("writeLong") + public void writeLong(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 115 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 116 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 117 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 118 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 119 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 120 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 121 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 122 + } // L: 123 + + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-75" + garbageValue = "123" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); - } + this.writeByte(var1 ? 1 : 0); // L: 126 + } // L: 127 - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-409810" + garbageValue = "-1386368008" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); - if (var2 >= 0) { + int var2 = var1.indexOf(0); // L: 134 + if (var2 >= 0) { // L: 135 throw new IllegalArgumentException(""); } else { - this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; + this.offset += class280.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 136 + this.array[++this.offset - 1] = 0; // L: 137 } - } + } // L: 138 - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "116" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-474138065" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); - if (var2 >= 0) { + int var2 = var1.indexOf(0); // L: 141 + if (var2 >= 0) { // L: 142 throw new IllegalArgumentException(""); } else { - this.array[++this.offset - 1] = 0; - this.offset += class16.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; + this.array[++this.offset - 1] = 0; // L: 143 + this.offset += class280.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 144 + this.array[++this.offset - 1] = 0; // L: 145 } - } + } // L: 146 - @ObfuscatedName("ae") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1728649284" + garbageValue = "916484170" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var2 = class244.method4662(var1); - this.array[++this.offset - 1] = 0; - this.writeVarInt(var2); - int var3 = this.offset * -2067647941; - byte[] var5 = this.array; - int var6 = this.offset; - int var7 = var1.length(); - int var8 = var6; + int var3 = var1.length(); // L: 151 + int var4 = 0; // L: 152 - for (int var9 = 0; var9 < var7; ++var9) { - char var10 = var1.charAt(var9); - if (var10 <= 127) { - var5[var8++] = (byte)var10; - } else if (var10 <= 2047) { - var5[var8++] = (byte)(192 | var10 >> 6); - var5[var8++] = (byte)(128 | var10 & '?'); + int var5; + for (var5 = 0; var5 < var3; ++var5) { // L: 153 + char var12 = var1.charAt(var5); // L: 154 + if (var12 <= 127) { // L: 155 + ++var4; + } else if (var12 <= 2047) { // L: 156 + var4 += 2; } else { - var5[var8++] = (byte)(224 | var10 >> '\f'); - var5[var8++] = (byte)(128 | var10 >> 6 & 63); - var5[var8++] = (byte)(128 | var10 & '?'); + var4 += 3; // L: 157 } } - int var4 = var8 - var6; - this.offset = (var3 + var4 * -2067647941) * -516434189; - } + this.array[++this.offset - 1] = 0; // L: 162 + this.writeVarInt(var4); // L: 163 + var4 = this.offset * -288034005; // L: 164 + byte[] var6 = this.array; // L: 166 + int var7 = this.offset; // L: 167 + int var8 = var1.length(); // L: 169 + int var9 = var7; // L: 170 - @ObfuscatedName("ai") + for (int var10 = 0; var10 < var8; ++var10) { // L: 171 + char var11 = var1.charAt(var10); // L: 172 + if (var11 <= 127) { // L: 173 + var6[var9++] = (byte)var11; // L: 174 + } else if (var11 <= 2047) { // L: 176 + var6[var9++] = (byte)(192 | var11 >> 6); // L: 177 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 178 + } else { + var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 181 + var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 182 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 183 + } + } + + var5 = var9 - var7; // L: 186 + this.offset = (var5 * -288034005 + var4) * 1120023427; // L: 188 + } // L: 189 + + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "6" + descriptor = "([BIII)V", + garbageValue = "1668528908" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 192 this.array[++this.offset - 1] = var1[var4]; } - } + } // L: 193 @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-1026158743" + descriptor = "(Lop;I)V", + garbageValue = "-1147634113" ) - public void method6890(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); - } + public void method6960(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 196 + } // L: 197 - @ObfuscatedName("bf") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(IS)V", + garbageValue = "8192" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { - throw new IllegalArgumentException(); + if (var1 < 0) { // L: 200 + throw new IllegalArgumentException(); // L: 201 } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); - this.array[this.offset - var1 - 1] = (byte)var1; + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 203 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 204 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 205 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 206 } - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "975561986" - ) - @Export("writeLengthShort") - public void writeLengthShort(int var1) { - 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(); - } - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" - ) - public void method6918(int var1) { - if (var1 >= 0 && var1 <= 255) { - this.array[this.offset - var1 - 1] = (byte)var1; - } else { - throw new IllegalArgumentException(); - } - } + } // L: 207 @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "86" + descriptor = "(II)V", + garbageValue = "1853887744" + ) + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 210 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 213 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 214 + } else { + throw new IllegalArgumentException(); // L: 211 + } + } // L: 215 + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1322948126" + ) + public void method6963(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 218 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 221 + } else { + throw new IllegalArgumentException(); // L: 219 + } + } // L: 222 + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-642432279" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { - this.writeByte(var1); - } else if (var1 >= 0 && var1 < 32768) { - this.writeShort(var1 + 32768); + if (var1 >= 0 && var1 < 128) { // L: 225 + this.writeByte(var1); // L: 226 + } else if (var1 >= 0 && var1 < 32768) { // L: 229 + this.writeShort(var1 + 32768); // L: 230 } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 233 } - } + } // L: 227 231 - @ObfuscatedName("bu") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-100" + descriptor = "(II)V", + garbageValue = "-1155174988" ) @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { - if ((var1 & -16384) != 0) { - if ((var1 & -2097152) != 0) { - if ((var1 & -268435456) != 0) { + if ((var1 & -128) != 0) { // L: 237 + if ((var1 & -16384) != 0) { // L: 238 + if ((var1 & -2097152) != 0) { // L: 239 + if ((var1 & -268435456) != 0) { // L: 240 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); + this.writeByte(var1 >>> 21 | 128); // L: 241 } - this.writeByte(var1 >>> 14 | 128); + this.writeByte(var1 >>> 14 | 128); // L: 243 } - this.writeByte(var1 >>> 7 | 128); + this.writeByte(var1 >>> 7 | 128); // L: 245 } - this.writeByte(var1 & 127); - } + this.writeByte(var1 & 127); // L: 247 + } // L: 248 - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "57" + descriptor = "(I)I", + garbageValue = "1818316420" ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "1" - ) - @Export("readByte") - public byte readByte() { - return this.array[++this.offset - 1]; + return this.array[++this.offset - 1] & 255; // L: 251 } @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1928415407" + descriptor = "(I)B", + garbageValue = "567219171" ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-45" - ) - @Export("readShort") - public int readShort() { - this.offset += 2; - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "75" - ) - @Export("readMedium") - public int readMedium() { - 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("bd") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1811121852" - ) - @Export("readInt") - public int readInt() { - 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") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "52" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; - long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-942940190" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "50" - ) - @Export("readStringCp1252NullTerminatedOrNull") - public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { - ++this.offset; - return null; - } else { - return this.readStringCp1252NullTerminated(); - } - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "26859" - ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; - - while (this.array[++this.offset - 1] != 0) { - } - - int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : Fonts.decodeStringCp1252(this.array, var1, var2); - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1099796438" - ) - @Export("readStringCp1252NullCircumfixed") - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; - if (var1 != 0) { - throw new IllegalStateException(""); - } else { - int var2 = this.offset; - - while (this.array[++this.offset - 1] != 0) { - } - - int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : Fonts.decodeStringCp1252(this.array, var2, var3); - } - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "54" - ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; - if (var1 != 0) { - throw new IllegalStateException(""); - } else { - int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); - } else { - String var3 = AbstractUserComparator.method6049(this.array, this.offset, var2); - this.offset += var2; - return var3; - } - } - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-693661515" - ) - @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]; - } - - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2134278528" - ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; - } - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-92" - ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-594025091" - ) - public int method7037() { - int var1 = 0; - - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { - var1 += 32767; - } - - var1 += var2; - return var1; - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1925418071" - ) - public int method6912() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 255 } @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1930651034" + garbageValue = "-156888586" ) - public int method6977() { - if (this.array[this.offset] < 0) { + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 259 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 260 + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "8" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 264 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 265 + if (var1 > 32767) { // L: 266 + var1 -= 65536; + } + + return var1; // L: 267 + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "12" + ) + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 271 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 272 + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-662873675" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 276 + 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: 277 + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "1642712423" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 281 + long var3 = (long)this.readInt() & 4294967295L; // L: 282 + return var3 + (var1 << 32); // L: 283 + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-99" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 287 + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "92" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { // L: 291 + ++this.offset; // L: 292 + return null; // L: 293 + } else { + return this.readStringCp1252NullTerminated(); // L: 295 + } + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2118366594" + ) + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 299 + + while (this.array[++this.offset - 1] != 0) { // L: 300 + } + + int var2 = this.offset - var1 - 1; // L: 301 + return var2 == 0 ? "" : class264.decodeStringCp1252(this.array, var1, var2); // L: 302 303 + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1836215149" + ) + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 307 + if (var1 != 0) { // L: 308 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 309 + + while (this.array[++this.offset - 1] != 0) { // L: 310 + } + + int var3 = this.offset - var2 - 1; // L: 311 + return var3 == 0 ? "" : class264.decodeStringCp1252(this.array, var2, var3); // L: 312 313 + } + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" + ) + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 317 + if (var1 != 0) { // L: 318 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 319 + if (var2 + this.offset > this.array.length) { // L: 320 + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; // L: 322 + int var5 = this.offset; // L: 323 + char[] var6 = new char[var2]; // L: 325 + int var7 = 0; // L: 326 + int var8 = var5; // L: 327 + + int var11; + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 328 329 360 + int var10 = var4[var8++] & 255; // L: 330 + if (var10 < 128) { // L: 332 + if (var10 == 0) { // L: 333 + var11 = 65533; + } else { + var11 = var10; // L: 334 + } + } else if (var10 < 192) { // L: 336 + var11 = 65533; + } else if (var10 < 224) { // L: 337 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 338 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 339 + if (var11 < 128) { // L: 340 + var11 = 65533; + } + } else { + var11 = 65533; // L: 342 + } + } else if (var10 < 240) { // L: 344 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 345 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 346 + if (var11 < 2048) { // L: 347 + var11 = 65533; + } + } else { + var11 = 65533; // L: 349 + } + } else if (var10 < 248) { // L: 351 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 352 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 353 + if (var11 >= 65536 && var11 <= 1114111) { // L: 354 + var11 = 65533; // L: 355 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 357 + } + } else { + var11 = 65533; // L: 359 + } + } + + String var3 = new String(var6, 0, var7); // L: 362 + this.offset += var2; // L: 365 + return var3; // L: 366 + } + } + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "([BIIS)V", + garbageValue = "-19541" + ) + @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: 370 + } + + } // L: 371 + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "67024683" + ) + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 374 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 375 376 + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "58" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 380 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 381 382 + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "160" + ) + public int method6981() { + int var1 = 0; // L: 386 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 387 388 390 + var1 += 32767; // L: 389 + } + + var1 += var2; // L: 392 + return var1; // L: 393 + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1825334288" + ) + public int method6982() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 397 398 + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "74" + ) + public int method6946() { + if (this.array[this.offset] < 0) { // L: 402 return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.readUnsignedShort(); - return var1 == 32767 ? -1 : var1; + int var1 = this.readUnsignedShort(); // L: 403 + return var1 == 32767 ? -1 : var1; // L: 404 } } @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "22177" + descriptor = "(I)I", + garbageValue = "-1116819358" ) @Export("readVarInt") public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; + byte var1 = this.array[++this.offset - 1]; // L: 409 int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { - var2 = (var2 | var1 & 127) << 7; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 410 411 413 + var2 = (var2 | var1 & 127) << 7; // L: 412 } - return var2 | var1; - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "863382683" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; - this.offset = 0; - - 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) { - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; - var6 += var7; - } - - this.offset -= 8; - this.writeInt(var4); - this.writeInt(var5); - } - - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-547352662" - ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; - this.offset = 0; - - 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]) { - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; - var6 -= var7; - } - - this.offset -= 8; - this.writeInt(var4); - this.writeInt(var5); - } - - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-1763734485" - ) - @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; - this.offset = var2; - int var5 = (var3 - var2) / 8; - - 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) { - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; - var9 += var10; - } - - this.offset -= 8; - this.writeInt(var7); - this.writeInt(var8); - } - - this.offset = var4; - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-796968358" - ) - @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; - this.offset = var2; - int var5 = (var3 - var2) / 8; - - 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]) { - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; - var9 -= var10; - } - - this.offset -= 8; - this.writeInt(var7); - this.writeInt(var8); - } - - this.offset = var4; - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "2051206809" - ) - @Export("encryptRsa") - public void encryptRsa(BigInteger var1, BigInteger var2) { - 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("cd") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "78" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - int var2 = IgnoreList.method5946(this.array, var1, this.offset); - this.writeInt(var2); - return var2; - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-6" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; - int var1 = IgnoreList.method5946(this.array, 0, this.offset); - int var2 = this.readInt(); - return var1 == var2; - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "55" - ) - public void method7066(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-32" - ) - public void method7117(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); + return var2 | var1; // L: 415 } @ObfuscatedName("cq") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "255" + descriptor = "([IB)V", + garbageValue = "0" ) - public void method7026(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 419 + this.offset = 0; // L: 420 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 421 + int var4 = this.readInt(); // L: 422 + int var5 = this.readInt(); // L: 423 + int var6 = 0; // L: 424 + int var7 = -1640531527; // L: 425 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 426 427 430 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 428 + var6 += var7; // L: 429 + } + + this.offset -= 8; // L: 432 + this.writeInt(var4); // L: 433 + this.writeInt(var5); // L: 434 + } + + } // L: 436 + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "([IB)V", + garbageValue = "-72" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 439 + this.offset = 0; // L: 440 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 441 + int var4 = this.readInt(); // L: 442 + int var5 = this.readInt(); // L: 443 + int var6 = -957401312; // L: 444 + int var7 = -1640531527; // L: 445 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 446 447 450 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 448 + var6 -= var7; // L: 449 + } + + this.offset -= 8; // L: 452 + this.writeInt(var4); // L: 453 + this.writeInt(var5); // L: 454 + } + + } // L: 456 + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-1821183174" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 459 + this.offset = var2; // L: 460 + int var5 = (var3 - var2) / 8; // L: 461 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 462 + int var7 = this.readInt(); // L: 463 + int var8 = this.readInt(); // L: 464 + int var9 = 0; // L: 465 + int var10 = -1640531527; // L: 466 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 467 468 471 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 469 + var9 += var10; // L: 470 + } + + this.offset -= 8; // L: 473 + this.writeInt(var7); // L: 474 + this.writeInt(var8); // L: 475 + } + + this.offset = var4; // L: 477 + } // L: 478 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-1004860310" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 481 + this.offset = var2; // L: 482 + int var5 = (var3 - var2) / 8; // L: 483 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 484 + int var7 = this.readInt(); // L: 485 + int var8 = this.readInt(); // L: 486 + int var9 = -957401312; // L: 487 + int var10 = -1640531527; // L: 488 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 489 490 493 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 491 + var9 -= var10; // L: 492 + } + + this.offset -= 8; // L: 495 + this.writeInt(var7); // L: 496 + this.writeInt(var8); // L: 497 + } + + this.offset = var4; // L: 499 + } // L: 500 + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", + garbageValue = "-39" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 503 + this.offset = 0; // L: 504 + byte[] var4 = new byte[var3]; // L: 505 + this.readBytes(var4, 0, var3); // L: 506 + BigInteger var5 = new BigInteger(var4); // L: 507 + BigInteger var6 = var5.modPow(var1, var2); // L: 508 + byte[] var7 = var6.toByteArray(); // L: 509 + this.offset = 0; // L: 510 + this.writeShort(var7.length); // L: 511 + this.writeBytes(var7, 0, var7.length); // L: 512 + } // L: 513 + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "651781584" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = class117.method2565(this.array, var1, this.offset); // L: 516 + this.writeInt(var2); // L: 517 + return var2; // L: 518 } + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1732705730" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 522 + int var1 = class117.method2565(this.array, 0, this.offset); // L: 523 + int var2 = this.readInt(); // L: 524 + return var1 == var2; // L: 525 + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-803217558" + ) + public void method7171(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 530 + } // L: 531 + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1557647527" + ) + public void method6993(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 534 + } // L: 535 + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-79" + descriptor = "(IB)V", + garbageValue = "27" ) - public int method6925() { - return this.array[++this.offset - 1] - 128 & 255; + public void method6947(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 538 + } // L: 539 + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-933914321" + ) + public int method6995() { + return this.array[++this.offset - 1] - 128 & 255; // L: 542 + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1659267158" + ) + public int method6996() { + return 0 - this.array[++this.offset - 1] & 255; // L: 546 + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "299017" + ) + public int method6997() { + return 128 - this.array[++this.offset - 1] & 255; // L: 550 } @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1456947240" + descriptor = "(I)B", + garbageValue = "-466550700" ) - public int method6926() { - return 0 - this.array[++this.offset - 1] & 255; + public byte method6973() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 554 } - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "2571" - ) - public int method6927() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cz") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "1295563496" + garbageValue = "-1366587411" ) - public byte method6958() { - return (byte)(this.array[++this.offset - 1] - 128); + public byte method6999() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 558 } @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "197304" + garbageValue = "1916872137" ) - public byte method6929() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1599053480" - ) - public byte method6915() { - return (byte)(128 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "127" - ) - public void method6930(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "466660080" - ) - public void method6931(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2130162206" - ) - public void method7029(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public byte method7128() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 562 } @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1251712043" + descriptor = "(II)V", + garbageValue = "-355235162" ) - public int method6933() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - } + public void method7001(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 566 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567 + } // L: 568 - @ObfuscatedName("cj") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-9" + descriptor = "(IB)V", + garbageValue = "1" ) - public int method6934() { - this.offset += 2; - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); - } + public void method6962(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 571 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 572 + } // L: 573 - @ObfuscatedName("co") + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2013527897" + ) + public void method7003(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 576 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 577 + } // L: 578 + + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "900126774" + garbageValue = "329550044" ) - public int method7059() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + public int method7004() { + this.offset += 2; // L: 581 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 582 } - @ObfuscatedName("ck") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-720542737" + garbageValue = "1756257139" ) - public int method6936() { - 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; - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1865920590" - ) - public int method6937() { - this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; + public int method7120() { + this.offset += 2; // L: 586 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 587 } @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "97" + descriptor = "(B)I", + garbageValue = "-1" ) - public void method6938(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); + public int method7006() { + this.offset += 2; // L: 591 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 592 } - @ObfuscatedName("db") + @ObfuscatedName("co") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "123" ) - public int method6939() { - this.offset += 3; - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); + public int method7007() { + this.offset += 2; // L: 596 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 597 + if (var1 > 32767) { // L: 598 + var1 -= 65536; + } + + return var1; // L: 599 } - @ObfuscatedName("dx") + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2144664606" + ) + public int method7008() { + this.offset += 2; // L: 603 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 604 + if (var1 > 32767) { // L: 605 + var1 -= 65536; + } + + return var1; // L: 606 + } + + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-82136411" + garbageValue = "-410665583" ) - public void method6940(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - } - - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-307515675" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-95" - ) - public void method6942(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } + public void method7009(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 610 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 611 + this.array[++this.offset - 1] = (byte)var1; // L: 612 + } // L: 613 @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "96" + descriptor = "(IB)V", + garbageValue = "-33" ) - public int method6876() { - 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); - } + public void method7010(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 616 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 617 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 618 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 619 + } // L: 620 - @ObfuscatedName("du") + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1586586045" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 623 + this.array[++this.offset - 1] = (byte)var1; // L: 624 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 625 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 626 + } // L: 627 + + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1701296195" + ) + public void method7126(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 630 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 631 + this.array[++this.offset - 1] = (byte)var1; // L: 632 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 633 + } // L: 634 + + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "312632753" + garbageValue = "268268119" ) - public int method6944() { - 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); + public int method7044() { + this.offset += 4; // L: 637 + 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: 638 + } + + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1588382751" + ) + public int method7021() { + this.offset += 4; // L: 642 + 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: 643 } @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1456395116" + garbageValue = "-502850525" ) - public int method6945() { - 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); + public int method7015() { + this.offset += 4; // L: 647 + 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: 648 } - @ObfuscatedName("dy") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1526065046" + garbageValue = "742968975" ) - public void method7021(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + public void method7131(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 652 var1[var4] = this.array[++this.offset - 1]; } - } + } // L: 653 - @ObfuscatedName("dl") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-986776784" + descriptor = "([BIIB)V", + garbageValue = "-86" ) - public void method6947(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); + public void method7017(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 656 } + } // L: 657 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)Lfn;", + garbageValue = "-75" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 + var1 = new ParamComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 30 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 9b17887000..a8f531b0b8 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,987 +6,380 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") +@ObfuscatedName("nw") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnv;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 3803654065118092599L + longValue = -6317381992095102917L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1716625 + intValue = -1221332547 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -3917728947088480487L + longValue = -4589180679836101363L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -134660613 + intValue = -583652263 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -3908614714839997389L + longValue = -7053248549753571513L ) @Export("offset") long offset; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -3499292866230120847L + longValue = 546860634892874135L ) @Export("fileLength") long fileLength; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -7962617539745217193L + longValue = -7491440461977223765L ) @Export("length") long length; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = -2583030338876644241L + longValue = 1371113279815841657L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lnj;II)V" + descriptor = "(Lnv;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { - 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; - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "633465894" + garbageValue = "-573814690" ) @Export("close") public void close() throws IOException { - this.flush(); - this.accessFile.close(); - } + this.flush(); // L: 28 + this.accessFile.close(); // L: 29 + } // L: 30 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("seek") public void seek(long var1) throws IOException { - if (var1 < 0L) { + if (var1 < 0L) { // L: 33 throw new IOException(""); } else { - this.offset = var1; + this.offset = var1; // L: 34 } - } + } // L: 35 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "1268577977" + garbageValue = "2046761239" ) @Export("length") public long length() { - return this.length; + return this.length; // L: 38 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1972830494" + garbageValue = "1753178640" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); - } + this.read(var1, 0, var1.length); // L: 42 + } // L: 43 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1193607068" + garbageValue = "265533303" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { - if (var3 + var2 > var1.length) { + if (var3 + var2 > var1.length) { // L: 47 throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { - System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); - this.offset += (long)var3; - return; + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 + this.offset += (long)var3; // L: 50 + return; // L: 51 } - long var4 = this.offset; - int var7 = var3; + long var4 = this.offset; // L: 53 + int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { - var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); - if (var8 > var3) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 + var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 + if (var8 > var3) { // L: 58 var8 = var3; } - System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); - this.offset += (long)var8; - var2 += var8; - var3 -= var8; + 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 } - if (var3 > this.readBuffer.length) { - this.accessFile.seek(this.offset); + if (var3 > this.readBuffer.length) { // L: 64 + this.accessFile.seek(this.offset); // L: 65 - for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { - var8 = this.accessFile.read(var1, var2, var3); - if (var8 == -1) { + 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 break; } - this.fileOffset += (long)var8; - this.offset += (long)var8; - var2 += var8; + this.fileOffset += (long)var8; // L: 70 + this.offset += (long)var8; // L: 71 + var2 += var8; // L: 72 } - } else if (var3 > 0) { - this.load(); - var8 = var3; - if (var3 > this.readBufferLength) { + } else if (var3 > 0) { // L: 76 + this.load(); // L: 77 + var8 = var3; // L: 78 + if (var3 > this.readBufferLength) { // L: 79 var8 = this.readBufferLength; } - System.arraycopy(this.readBuffer, 0, var1, var2, var8); - var2 += var8; - var3 -= var8; - this.offset += (long)var8; + System.arraycopy(this.readBuffer, 0, var1, var2, var8); // L: 80 + var2 += var8; // L: 81 + var3 -= var8; // L: 82 + this.offset += (long)var8; // L: 83 } - if (this.writeBufferOffset != -1L) { - if (this.writeBufferOffset > this.offset && var3 > 0) { - var8 = var2 + (int)(this.writeBufferOffset - this.offset); - if (var8 > var3 + var2) { + if (-1L != this.writeBufferOffset) { // 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 var8 = var3 + var2; } - while (var2 < var8) { - var1[var2++] = 0; - --var3; - ++this.offset; + while (var2 < var8) { // L: 89 + var1[var2++] = 0; // L: 90 + --var3; // L: 91 + ++this.offset; // L: 92 } } - long var13 = -1L; - long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { - var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { - var13 = var4; + long var13 = -1L; // L: 95 + long var10 = -1L; // L: 96 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 + var13 = this.writeBufferOffset; // L: 98 + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 + var13 = var4; // L: 101 } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { - var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = (long)var7 + var4; + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103 + var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104 + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 + var10 = (long)var7 + var4; // L: 107 } - 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; + 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 } } } - } catch (IOException var16) { - this.fileOffset = -1L; - throw var16; + } catch (IOException var16) { // L: 120 + this.fileOffset = -1L; // L: 121 + throw var16; // L: 122 } - if (var3 > 0) { + if (var3 > 0) { // L: 124 throw new EOFException(); } - } + } // L: 125 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-49" + descriptor = "(S)V", + garbageValue = "255" ) @Export("load") void load() throws IOException { - this.readBufferLength = 0; - if (this.offset != this.fileOffset) { - this.accessFile.seek(this.offset); - this.fileOffset = this.offset; + 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 } int var2; - for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { - int var1 = this.readBuffer.length - this.readBufferLength; - if (var1 > 200000000) { + 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 var1 = 200000000; } - var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); - if (var2 == -1) { + var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); // L: 137 + if (var2 == -1) { // L: 138 break; } - this.fileOffset += (long)var2; + this.fileOffset += (long)var2; // L: 139 } - } + } // L: 142 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-24" + garbageValue = "114" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { - this.length = this.offset + (long)var3; + if ((long)var3 + this.offset > this.length) { // L: 146 + this.length = (long)var3 + this.offset; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { - this.flush(); + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 + this.flush(); // L: 148 } - if (this.writeBufferOffset != -1L && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { - int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); - this.offset += (long)var4; - var2 += var4; - var3 -= var4; - this.writeBufferLength = this.writeBuffer.length; - this.flush(); + if (this.writeBufferOffset != -1L && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // 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 (var3 <= this.writeBuffer.length) { - if (var3 > 0) { - if (-1L == this.writeBufferOffset) { + if (var3 <= this.writeBuffer.length) { // L: 159 + if (var3 > 0) { // L: 188 + if (-1L == this.writeBufferOffset) { // L: 189 this.writeBufferOffset = this.offset; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); - this.offset += (long)var3; - if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { + 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 this.writeBufferLength = (int)(this.offset - this.writeBufferOffset); } } } else { - if (this.fileOffset != this.offset) { - this.accessFile.seek(this.offset); - this.fileOffset = this.offset; + if (this.fileOffset != this.offset) { // L: 160 + this.accessFile.seek(this.offset); // L: 161 + this.fileOffset = this.offset; // L: 162 } - this.accessFile.write(var1, var2, var3); - this.fileOffset += (long)var3; - if (this.fileOffset > this.fileLength) { + this.accessFile.write(var1, var2, var3); // L: 164 + this.fileOffset += (long)var3; // L: 165 + if (this.fileOffset > this.fileLength) { // L: 166 this.fileLength = this.fileOffset; } - 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 < this.offset + (long)var3) { - var9 = this.readBufferOffset; + long var9 = -1L; // L: 167 + long var6 = -1L; // L: 168 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 + var9 = this.offset; // L: 170 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 + var9 = this.readBufferOffset; // L: 173 } - if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = this.offset + (long)var3; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { - var6 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + var6 = (long)var3 + this.offset; // L: 176 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178 + var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 } - if (var9 > -1L && var6 > var9) { - int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + if (var9 > -1L && var6 > var9) { // L: 181 + int var8 = (int)(var6 - var9); // L: 182 + System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183 } - this.offset += (long)var3; + this.offset += (long)var3; // L: 185 } - } catch (IOException var12) { - this.fileOffset = -1L; - throw var12; + } catch (IOException var12) { // L: 196 + this.fileOffset = -1L; // L: 197 + throw var12; // L: 198 } - } + } // L: 186 193 200 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-11" + descriptor = "(I)V", + garbageValue = "-435549947" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { - if (this.fileOffset != this.writeBufferOffset) { - this.accessFile.seek(this.writeBufferOffset); - this.fileOffset = this.writeBufferOffset; + if (this.writeBufferOffset != -1L) { // L: 203 + if (this.fileOffset != this.writeBufferOffset) { // L: 204 + this.accessFile.seek(this.writeBufferOffset); // L: 205 + this.fileOffset = this.writeBufferOffset; // L: 206 } - this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)this.writeBufferLength * 204069641583067137L; - if (this.fileOffset > this.fileLength) { + this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 + this.fileOffset += (long)this.writeBufferLength * -485868214014705663L; // L: 209 + if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } - long var1 = -1L; - long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { - var1 = this.writeBufferOffset; - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { - var1 = this.readBufferOffset; + 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 } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { - var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 + var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223 } - 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); + 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 } - this.writeBufferOffset = -1L; - this.writeBufferLength = 0; + this.writeBufferOffset = -1L; // L: 229 + this.writeBufferLength = 0; // L: 230 } - } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(Lcd;IIIIIB)V", - garbageValue = "-1" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCComposition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var76 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - int var10; - if (var1 < var76 && var0.playerCycle == Client.cycle && class117.method2516((Player)var0)) { - Player var9 = (Player)var0; - if (var1 < var76) { - var10 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var10); - AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var12 = 9; - var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); - var8 = 18; - } - } - - int var77 = -2; - int var17; - int var23; - int var24; - if (!var0.healthBars.method5563()) { - var10 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var10); - - for (HealthBar var89 = (HealthBar)var0.healthBars.last(); var89 != null; var89 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var81 = var89.get(Client.cycle); - if (var81 == null) { - if (var89.isEmpty()) { - var89.remove(); - } - } else { - HealthBarDefinition var13 = var89.definition; - SpritePixels var82 = var13.getBackSprite(); - SpritePixels var83 = var13.getFrontSprite(); - var17 = 0; - int var84; - if (var82 != null && var83 != null) { - if (var13.widthPadding * 2 < var83.subWidth) { - var17 = var13.widthPadding; - } - - var84 = var83.subWidth - var17 * 2; - } else { - var84 = var13.width; - } - - int var18 = 255; - boolean var85 = true; - int var86 = Client.cycle - var81.cycle; - int var87 = var84 * var81.health2 / var13.width; - int var88; - int var94; - if (var81.cycleOffset > var86) { - var88 = var13.field1679 == 0 ? 0 : var13.field1679 * (var86 / var13.field1679); - var23 = var84 * var81.health / var13.width; - var94 = var88 * (var87 - var23) / var81.cycleOffset + var23; - } else { - var94 = var87; - var88 = var13.int5 + var81.cycleOffset - var86; - if (var13.int3 >= 0) { - var18 = (var88 << 8) / (var13.int5 - var13.int3); - } - } - - if (var81.health2 > 0 && var94 < 1) { - var94 = 1; - } - - if (var82 != null && var83 != null) { - if (var84 == var94) { - var94 += var17 * 2; - } else { - var94 += var17; - } - - var88 = var82.subHeight; - var77 += var88; - var23 = var2 + Client.viewportTempX - (var84 >> 1); - var24 = var3 + Client.viewportTempY - var77; - var23 -= var17; - if (var18 >= 0 && var18 < 255) { - var82.drawTransAt(var23, var24, var18); - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var88 + var24); - var83.drawTransAt(var23, var24, var18); - } else { - var82.drawTransBgAt(var23, var24); - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var88 + var24); - var83.drawTransBgAt(var23, var24); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var77 += 2; - } else { - var77 += 5; - if (Client.viewportTempX > -1) { - var88 = var2 + Client.viewportTempX - (var84 >> 1); - var23 = var3 + Client.viewportTempY - var77; - Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var94, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var88, var23, var84 - var94, 5, 16711680); - } - - var77 += 2; - } - } - } - } - - if (var77 == -2) { - var77 += 7; - } - - var77 += var8; - int var79; - if (var1 < var76) { - Player var78 = (Player)var0; - if (var78.isHidden) { - return; - } - - if (var78.headIconPk != -1 || var78.headIconPrayer != -1) { - var79 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var79); - if (Client.viewportTempX > -1) { - if (var78.headIconPk != -1) { - var77 += 25; - class21.headIconPkSprites[var78.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - - if (var78.headIconPrayer != -1) { - var77 += 25; - HealthBarUpdate.headIconPrayerSprites[var78.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - var79 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var79); - if (Client.viewportTempX > -1) { - var77 += UserComparator4.headIconHintSprites[1].subHeight; - UserComparator4.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - } - } else { - NPCComposition var93 = ((NPC)var0).definition; - if (var93.transforms != null) { - var93 = var93.transform(); - } - - if (var93.headIconPrayer >= 0 && var93.headIconPrayer < HealthBarUpdate.headIconPrayerSprites.length) { - var79 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var79); - if (Client.viewportTempX > -1) { - HealthBarUpdate.headIconPrayerSprites[var93.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - var79 = var0.defaultHeight + 15; - class124.worldToScreen(var0.x, var0.y, var79); - if (Client.viewportTempX > -1) { - UserComparator4.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var76 || !var0.field1121 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - var10 = var0.defaultHeight; - class124.worldToScreen(var0.x, var0.y, var10); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = Interpreter.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = Interpreter.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (var10 = 0; var10 < 4; ++var10) { - var79 = var0.hitSplatCycles[var10]; - int var90 = var0.hitSplatTypes[var10]; - HitSplatDefinition var91 = null; - int var14 = 0; - if (var90 >= 0) { - if (var79 <= Client.cycle) { - continue; - } - - var91 = ItemContainer.method2057(var0.hitSplatTypes[var10]); - var14 = var91.field1806; - if (var91 != null && var91.transforms != null) { - var91 = var91.transform(); - if (var91 == null) { - var0.hitSplatCycles[var10] = -1; - continue; - } - } - } else if (var79 < 0) { - continue; - } - - int var15 = var0.hitSplatTypes2[var10]; - HitSplatDefinition var16 = null; - if (var15 >= 0) { - var16 = ItemContainer.method2057(var15); - if (var16 != null && var16.transforms != null) { - var16 = var16.transform(); - } - } - - if (var79 - var14 <= Client.cycle) { - if (var91 == null) { - var0.hitSplatCycles[var10] = -1; - } else { - var17 = var0.defaultHeight / 2; - class124.worldToScreen(var0.x, var0.y, var17); - if (Client.viewportTempX > -1) { - if (var10 == 1) { - Client.viewportTempY -= 20; - } - - if (var10 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var10 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - SpritePixels var19 = null; - SpritePixels var20 = null; - SpritePixels var21 = null; - SpritePixels var22 = null; - var23 = 0; - var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - int var30 = 0; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels var33 = null; - SpritePixels var34 = null; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - int var43 = 0; - var19 = var91.method3159(); - int var44; - if (var19 != null) { - var23 = var19.subWidth; - var44 = var19.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var27 = var19.xOffset; - } - - var20 = var91.method3160(); - if (var20 != null) { - var24 = var20.subWidth; - var44 = var20.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var28 = var20.xOffset; - } - - var21 = var91.method3161(); - if (var21 != null) { - var25 = var21.subWidth; - var44 = var21.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var29 = var21.xOffset; - } - - var22 = var91.method3177(); - if (var22 != null) { - var26 = var22.subWidth; - var44 = var22.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var30 = var22.xOffset; - } - - if (var16 != null) { - var31 = var16.method3159(); - if (var31 != null) { - var35 = var31.subWidth; - var44 = var31.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var39 = var31.xOffset; - } - - var32 = var16.method3160(); - if (var32 != null) { - var36 = var32.subWidth; - var44 = var32.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var40 = var32.xOffset; - } - - var33 = var16.method3161(); - if (var33 != null) { - var37 = var33.subWidth; - var44 = var33.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var41 = var33.xOffset; - } - - var34 = var16.method3177(); - if (var34 != null) { - var38 = var34.subWidth; - var44 = var34.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var42 = var34.xOffset; - } - } - - Font var80 = var91.getFont(); - if (var80 == null) { - var80 = UserComparator8.fontPlain11; - } - - Font var45; - if (var16 != null) { - var45 = var16.getFont(); - if (var45 == null) { - var45 = UserComparator8.fontPlain11; - } - } else { - var45 = UserComparator8.fontPlain11; - } - - String var46 = null; - String var47 = null; - boolean var48 = false; - int var49 = 0; - var46 = var91.getString(var0.hitSplatValues[var10]); - int var92 = var80.stringWidth(var46); - if (var16 != null) { - var47 = var16.getString(var0.hitSplatValues2[var10]); - var49 = var45.stringWidth(var47); - } - - int var50 = 0; - int var51 = 0; - if (var24 > 0) { - if (var21 == null && var22 == null) { - var50 = 1; - } else { - var50 = var92 / var24 + 1; - } - } - - if (var16 != null && var36 > 0) { - if (var33 == null && var34 == null) { - var51 = 1; - } else { - var51 = var49 / var36 + 1; - } - } - - int var52 = 0; - int var53 = var52; - if (var23 > 0) { - var52 += var23; - } - - var52 += 2; - int var54 = var52; - if (var25 > 0) { - var52 += var25; - } - - int var55 = var52; - int var56 = var52; - int var57; - if (var24 > 0) { - var57 = var24 * var50; - var52 += var57; - var56 += (var57 - var92) / 2; - } else { - var52 += var92; - } - - var57 = var52; - if (var26 > 0) { - var52 += var26; - } - - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62 = 0; - int var63; - if (var16 != null) { - var52 += 2; - var58 = var52; - if (var35 > 0) { - var52 += var35; - } - - var52 += 2; - var59 = var52; - if (var37 > 0) { - var52 += var37; - } - - var60 = var52; - var62 = var52; - if (var36 > 0) { - var63 = var51 * var36; - var52 += var63; - var62 += (var63 - var49) / 2; - } else { - var52 += var49; - } - - var61 = var52; - if (var38 > 0) { - var52 += var38; - } - } - - var63 = var0.hitSplatCycles[var10] - Client.cycle; - int var64 = var91.field1811 - var63 * var91.field1811 / var91.field1806; - int var65 = var63 * var91.field1810 / var91.field1806 + -var91.field1810; - int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); - int var67 = var65 + (var3 + Client.viewportTempY - 12); - int var68 = var67; - int var69 = var67 + var43; - int var70 = var67 + var91.field1798 + 15; - int var71 = var70 - var80.maxAscent; - int var72 = var70 + var80.maxDescent; - if (var71 < var67) { - var68 = var71; - } - - if (var72 > var69) { - var69 = var72; - } - - int var73 = 0; - int var74; - int var75; - if (var16 != null) { - var73 = var67 + var16.field1798 + 15; - var74 = var73 - var45.maxAscent; - var75 = var73 + var45.maxDescent; - if (var74 < var68) { - ; - } - - if (var75 > var69) { - ; - } - } - - var74 = 255; - if (var91.field1813 >= 0) { - var74 = (var63 << 8) / (var91.field1806 - var91.field1813); - } - - if (var74 >= 0 && var74 < 255) { - if (var19 != null) { - var19.drawTransAt(var53 + var66 - var27, var67, var74); - } - - if (var21 != null) { - var21.drawTransAt(var54 + var66 - var29, var67, var74); - } - - if (var20 != null) { - for (var75 = 0; var75 < var50; ++var75) { - var20.drawTransAt(var75 * var24 + (var66 + var55 - var28), var67, var74); - } - } - - if (var22 != null) { - var22.drawTransAt(var66 + var57 - var30, var67, var74); - } - - var80.drawAlpha(var46, var56 + var66, var70, var91.textColor, 0, var74); - if (var16 != null) { - if (var31 != null) { - var31.drawTransAt(var66 + var58 - var39, var67, var74); - } - - if (var33 != null) { - var33.drawTransAt(var66 + var59 - var41, var67, var74); - } - - if (var32 != null) { - for (var75 = 0; var75 < var51; ++var75) { - var32.drawTransAt(var36 * var75 + (var66 + var60 - var40), var67, var74); - } - } - - if (var34 != null) { - var34.drawTransAt(var66 + var61 - var42, var67, var74); - } - - var45.drawAlpha(var47, var66 + var62, var73, var16.textColor, 0, var74); - } - } else { - if (var19 != null) { - var19.drawTransBgAt(var53 + var66 - var27, var67); - } - - if (var21 != null) { - var21.drawTransBgAt(var66 + var54 - var29, var67); - } - - if (var20 != null) { - for (var75 = 0; var75 < var50; ++var75) { - var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); - } - } - - if (var22 != null) { - var22.drawTransBgAt(var57 + var66 - var30, var67); - } - - var80.draw(var46, var56 + var66, var70, var91.textColor | -16777216, 0); - if (var16 != null) { - if (var31 != null) { - var31.drawTransBgAt(var58 + var66 - var39, var67); - } - - if (var33 != null) { - var33.drawTransBgAt(var66 + var59 - var41, var67); - } - - if (var32 != null) { - for (var75 = 0; var75 < var51; ++var75) { - var32.drawTransBgAt(var75 * var36 + (var60 + var66 - var40), var67); - } - } - - if (var34 != null) { - var34.drawTransBgAt(var66 + var61 - var42, var67); - } - - var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); - } - } - } - } - } - } - - } - } + } // L: 232 } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index e0210f429f..ed1042a536 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,137 +5,103 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mw") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("socket") Socket socket; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lme;" ) @Export("source") BufferedSource source; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmb;" ) @Export("sink") BufferedSink sink; - public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - 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); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "82" + garbageValue = "1" ) @Export("close") public void close() { - this.sink.close(); + this.sink.close(); // L: 42 try { - this.socket.close(); - } catch (IOException var2) { + this.socket.close(); // L: 44 + } catch (IOException var2) { // L: 46 } - this.source.close(); - } + this.source.close(); // L: 47 + } // L: 48 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1780579727" + garbageValue = "1953698452" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); + return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-973037380" + garbageValue = "-1632705310" ) @Export("available") public int available() throws IOException { - return this.source.available(); + return this.source.available(); // L: 26 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1444896063" + garbageValue = "-1771919747" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); + return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-95" + descriptor = "([BIII)I", + garbageValue = "-1246528305" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); + return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "34744814" + garbageValue = "-748791607" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); - } + this.sink.write(var1, var2, var3); // L: 38 + } // L: 39 protected void finalize() { - this.close(); - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(Ljt;I)Z", - garbageValue = "217783620" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = FriendsChat.method5992(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var2 == var3) { - return false; - } - } else if (var3 != var2) { - return false; - } - } - - return true; - } - } + this.close(); // L: 51 + } // L: 52 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 611353540a..4f55b934a2 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,195 +6,195 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("mb") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("thread") Thread thread; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1953104357 + intValue = 423842403 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("buffer") byte[] buffer; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -575194159 + intValue = -23497381 ) @Export("position") int position; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 454898237 + intValue = -756798361 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("exception") IOException exception; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { - 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(); - } + this.position = 0; // L: 186 + this.limit = 0; // L: 187 + this.outputStream = var1; // L: 192 + this.capacity = var2 + 1; // L: 193 + this.buffer = new byte[this.capacity]; // L: 194 + this.thread = new Thread(this); // L: 195 + this.thread.setDaemon(true); // L: 196 + this.thread.start(); // L: 197 + } // L: 198 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1922710165" + garbageValue = "-1714702657" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { + if (this.closed) { // L: 201 try { - this.outputStream.close(); + this.outputStream.close(); // L: 203 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 204 } - } catch (IOException var2) { + } catch (IOException var2) { // L: 206 if (this.exception == null) { - this.exception = new IOException(var2); + this.exception = new IOException(var2); // L: 207 } } - return true; + return true; // L: 209 } else { - return false; + return false; // L: 211 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-2088903664" + descriptor = "([BIIB)V", + garbageValue = "127" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { - synchronized(this) { - if (this.exception != null) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 + synchronized(this) { // L: 262 + if (this.exception != null) { // L: 263 throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 265 var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; + var5 = this.position - this.limit - 1; // L: 266 } - if (var5 < var3) { + if (var5 < var3) { // L: 267 throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); + if (var3 + this.limit <= this.capacity) { // L: 268 + System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 } else { - int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + int var6 = this.capacity - this.limit; // L: 272 + System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273 + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274 } - this.limit = (var3 + this.limit) % this.capacity; - this.notifyAll(); + this.limit = (var3 + this.limit) % this.capacity; // L: 276 + this.notifyAll(); // L: 277 } } } } else { throw new IOException(); } - } + } // L: 279 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1739455200" + garbageValue = "-1822143603" ) @Export("close") void close() { - synchronized(this) { - this.closed = true; - this.notifyAll(); - } + synchronized(this) { // L: 282 + this.closed = true; // L: 283 + this.notifyAll(); // L: 284 + } // L: 285 try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 287 + } catch (InterruptedException var3) { // L: 289 } - } + } // L: 290 public void run() { do { int var1; - synchronized(this) { + synchronized(this) { // L: 217 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 219 return; } - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 220 var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; + var1 = this.capacity - this.position + this.limit; // L: 221 } - if (var1 > 0) { + if (var1 > 0) { // L: 222 break; } try { - this.outputStream.flush(); - } catch (IOException var11) { - this.exception = var11; - return; + this.outputStream.flush(); // L: 224 + } catch (IOException var11) { // L: 226 + this.exception = var11; // L: 227 + return; // L: 228 } - if (this.isClosed()) { + if (this.isClosed()) { // L: 230 return; } try { - this.wait(); - } catch (InterruptedException var12) { + this.wait(); // L: 232 + } catch (InterruptedException var12) { // L: 234 } } } try { - if (var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); + if (var1 + this.position <= this.capacity) { // L: 238 + this.outputStream.write(this.buffer, this.position, var1); // L: 239 } else { - int var7 = this.capacity - this.position; - this.outputStream.write(this.buffer, this.position, var7); - this.outputStream.write(this.buffer, 0, var1 - var7); + int var7 = this.capacity - this.position; // L: 242 + this.outputStream.write(this.buffer, this.position, var7); // L: 243 + this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244 } - } catch (IOException var10) { + } catch (IOException var10) { // L: 247 IOException var2 = var10; - synchronized(this) { - this.exception = var2; - return; + synchronized(this) { // L: 248 + this.exception = var2; // L: 249 + return; // L: 250 } } - synchronized(this) { - this.position = (var1 + this.position) % this.capacity; - } - } while(!this.isClosed()); + synchronized(this) { // L: 253 + this.position = (var1 + this.position) % this.capacity; // L: 254 + } // L: 255 + } while(!this.isClosed()); // L: 256 } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 8c6187a80c..579bb3d216 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,78 +7,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") +@ObfuscatedName("me") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("thread") Thread thread; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2074831329 + intValue = 2040579907 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("buffer") byte[] buffer; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 669184035 + intValue = 1771772075 ) @Export("position") int position; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 730630793 + intValue = -207794261 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; - this.limit = 0; - this.inputStream = var1; - this.capacity = var2 + 1; - this.buffer = new byte[this.capacity]; - this.thread = new Thread(this); - this.thread.setDaemon(true); - this.thread.start(); - } + this.position = 0; // L: 59 + this.limit = 0; // L: 60 + this.inputStream = var1; // L: 64 + this.capacity = var2 + 1; // L: 65 + this.buffer = new byte[this.capacity]; // L: 66 + this.thread = new Thread(this); // L: 67 + this.thread.setDaemon(true); // L: 68 + this.thread.start(); // L: 69 + } // L: 70 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "57" + descriptor = "(II)Z", + garbageValue = "529289225" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + if (var1 == 0) { // L: 106 return true; - } else if (var1 > 0 && var1 < this.capacity) { - synchronized(this) { + } else if (var1 > 0 && var1 < this.capacity) { // L: 107 + synchronized(this) { // L: 108 int var3; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 110 var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; + var3 = this.capacity - this.position + this.limit; // L: 111 } - if (var3 < var1) { - if (this.exception != null) { + if (var3 < var1) { // L: 112 + if (this.exception != null) { // L: 113 throw new IOException(this.exception.toString()); } else { - this.notifyAll(); - return false; + this.notifyAll(); // L: 114 + return false; // L: 115 } } else { - return true; + return true; // L: 117 } } } else { @@ -86,87 +86,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1856553259" + descriptor = "(B)I", + garbageValue = "-50" ) @Export("available") int available() throws IOException { - synchronized(this) { + synchronized(this) { // L: 122 int var2; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 124 var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; // L: 125 } - if (var2 <= 0 && this.exception != null) { - throw new IOException(this.exception.toString()); + if (var2 <= 0 && this.exception != null) { // L: 126 + throw new IOException(this.exception.toString()); // L: 127 } else { - this.notifyAll(); - return var2; + this.notifyAll(); // L: 129 + return var2; // L: 130 } } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2099170047" + descriptor = "(B)I", + garbageValue = "-42" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { - if (this.limit == this.position) { - if (this.exception != null) { + synchronized(this) { // L: 135 + if (this.position == this.limit) { // L: 136 + if (this.exception != null) { // L: 137 throw new IOException(this.exception.toString()); } else { - return -1; + return -1; // L: 138 } } else { - int var2 = this.buffer[this.position] & 255; - this.position = (this.position + 1) % this.capacity; - this.notifyAll(); - return var2; + int var2 = this.buffer[this.position] & 255; // L: 140 + this.position = (this.position + 1) % this.capacity; // L: 141 + this.notifyAll(); // L: 142 + return var2; // L: 143 } } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "1042795969" + descriptor = "([BIIS)I", + garbageValue = "128" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { - synchronized(this) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148 + synchronized(this) { // L: 149 int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 151 var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; + var5 = this.capacity - this.position + this.limit; // L: 152 } - if (var3 > var5) { + if (var3 > var5) { // L: 153 var3 = var5; } - if (var3 == 0 && this.exception != null) { + if (var3 == 0 && this.exception != null) { // L: 154 throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); + if (var3 + this.position <= this.capacity) { // L: 155 + System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 156 } 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); + int var6 = this.capacity - this.position; // L: 159 + System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 160 + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 161 } - this.position = (var3 + this.position) % this.capacity; - this.notifyAll(); - return var3; + this.position = (var3 + this.position) % this.capacity; // L: 163 + this.notifyAll(); // L: 164 + return var3; // L: 165 } } } else { @@ -174,73 +174,82 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-90" + descriptor = "(I)V", + garbageValue = "-885928224" ) @Export("close") void close() { - synchronized(this) { + synchronized(this) { // L: 170 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 171 } - this.notifyAll(); + this.notifyAll(); // L: 172 } try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 175 + } catch (InterruptedException var3) { // L: 177 } - } + } // L: 178 public void run() { while (true) { int var1; - synchronized(this) { + synchronized(this) { // L: 75 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 77 return; } - if (this.position == 0) { + if (this.position == 0) { // L: 78 var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { + } else if (this.position <= this.limit) { // L: 79 var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; + var1 = this.position - this.limit - 1; // L: 80 } - if (var1 > 0) { + if (var1 > 0) { // L: 81 break; } try { - this.wait(); - } catch (InterruptedException var10) { + this.wait(); // L: 83 + } catch (InterruptedException var10) { // L: 85 } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); + var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 90 if (var7 == -1) { - throw new EOFException(); + throw new EOFException(); // L: 91 } - } catch (IOException var11) { + } catch (IOException var11) { // L: 93 IOException var3 = var11; - synchronized(this) { - this.exception = var3; - return; + synchronized(this) { // L: 94 + this.exception = var3; // L: 95 + return; // L: 96 } } - synchronized(this) { - this.limit = (var7 + this.limit) % this.capacity; - } + synchronized(this) { // L: 99 + this.limit = (var7 + this.limit) % this.capacity; // L: 100 + } // L: 101 } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[II)V", + garbageValue = "1983432139" + ) + public static void method6301(String[] var0, int[] var1) { + class122.method2599(var0, var1, 0, var0.length - 1); // L: 43 + } // L: 44 } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 21f7ee8002..a685792c14 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("np") +@ObfuscatedName("nb") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("byteArray") public byte[] byteArray; public ByteArrayNode(byte[] var1) { - this.byteArray = var1; - } + this.byteArray = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index a6690083ee..58dd794245 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -6,166 +6,177 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lb") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1396551111 + intValue = -476985145 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 893539471 + intValue = -1576005085 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -726411367 + intValue = -381672383 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2028367777 - ) - static int field3890; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -915452121 + intValue = -2068379159 ) static int field3891; - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1219309853 + intValue = 450416009 ) - static int field3892; + static int field3881; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -358256925 + ) + static int field3882; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -477323591 + ) + static int field3883; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 547302463 + intValue = 231839197 ) - static int field3899; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1927164801 - ) - static int field3897; - @ObfuscatedName("g") + static int field3884; + @ObfuscatedName("k") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("c") - static byte[][] field3898; + @ObfuscatedName("u") + static byte[][] field3888; @ObfuscatedName("z") - public static ArrayList field3893; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("d") + static ArrayList field3890; static { - ByteArrayPool_smallCount = 0; - ByteArrayPool_mediumCount = 0; - ByteArrayPool_largeCount = 0; - field3890 = 0; - field3891 = 1000; - field3892 = 250; - field3899 = 100; - field3897 = 50; - ByteArrayPool_small = new byte[1000][]; - ByteArrayPool_medium = new byte[250][]; - ByteArrayPool_large = new byte[100][]; - field3898 = new byte[50][]; - field3893 = new ArrayList(); - field3893.clear(); - field3893.add(100); - field3893.add(5000); - field3893.add(10000); - field3893.add(30000); + ByteArrayPool_smallCount = 0; // L: 13 + ByteArrayPool_mediumCount = 0; // L: 14 + ByteArrayPool_largeCount = 0; // L: 15 + field3891 = 0; // L: 16 + field3881 = 1000; // L: 17 + field3882 = 250; // L: 18 + field3883 = 100; // L: 19 + field3884 = 50; // L: 20 + ByteArrayPool_small = new byte[1000][]; // L: 21 + ByteArrayPool_medium = new byte[250][]; // L: 22 + ByteArrayPool_large = new byte[100][]; // L: 23 + field3888 = new byte[50][]; // L: 24 + field3890 = new ArrayList(); // L: 28 + class301.method5508(); // L: 31 new HashMap(); - } + } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IZB)[B", - garbageValue = "-56" + garbageValue = "66" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { + if (var0 != 100) { // L: 70 if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; - ByteArrayPool_small[ByteArrayPool_smallCount] = null; - return var4; + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 71 + ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 72 + return var4; // L: 73 } - if (var0 != 5000) { + if (var0 != 5000) { // L: 75 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; - return var4; + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 76 + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 77 + return var4; // L: 78 } - if (var0 != 10000) { + if (var0 != 10000) { // L: 80 if (var0 < 10000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; - ByteArrayPool_large[ByteArrayPool_largeCount] = null; - return var4; + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 81 + ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 82 + return var4; // L: 83 } - if (var0 != 30000) { + if (var0 != 30000) { // L: 85 if (var0 < 30000) { } - } else if (field3890 > 0) { - var4 = field3898[--field3890]; - field3898[field3890] = null; - return var4; + } else if (field3891 > 0) { + var4 = field3888[--field3891]; // L: 86 + field3888[field3891] = null; // L: 87 + return var4; // L: 88 } - if (class117.ByteArrayPool_arrays != null) { - for (int var2 = 0; var2 < GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes.length; ++var2) { - if (GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes[var2] != var0) { - if (var0 < GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes[var2]) { + if (class260.ByteArrayPool_arrays != null) { // L: 90 + for (int var2 = 0; var2 < class176.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91 + if (class176.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92 + if (var0 < class176.ByteArrayPool_alternativeSizes[var2]) { } - } else if (Message.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = class117.ByteArrayPool_arrays[var2][--Message.ByteArrayPool_altSizeArrayCounts[var2]]; - class117.ByteArrayPool_arrays[var2][Message.ByteArrayPool_altSizeArrayCounts[var2]] = null; - return var3; + } else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = class260.ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93 + class260.ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94 + return var3; // L: 95 } } } - return new byte[var0]; + return new byte[var0]; // L: 108 } - @ObfuscatedName("a") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1095042246" + descriptor = "([BB)[B", + garbageValue = "-21" ) - public static int[] method5897() { - int[] var0 = new int[KeyHandler.field136]; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 406 + int var2 = var1.readUnsignedByte(); // L: 407 + int var3 = var1.readInt(); // L: 408 + if (var3 < 0 || AbstractArchive.field3702 != 0 && var3 > AbstractArchive.field3702) { // L: 409 + throw new RuntimeException(); // L: 410 + } else if (var2 == 0) { // L: 412 + byte[] var6 = new byte[var3]; // L: 413 + var1.readBytes(var6, 0, var3); // L: 414 + return var6; // L: 415 + } else { + int var4 = var1.readInt(); // L: 418 + if (var4 >= 0 && (AbstractArchive.field3702 == 0 || var4 <= AbstractArchive.field3702)) { // L: 419 + byte[] var5 = new byte[var4]; // L: 422 + if (var2 == 1) { // L: 423 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 424 + } - for (int var1 = 0; var1 < KeyHandler.field136; ++var1) { - var0[var1] = KeyHandler.field135[var1]; + return var5; // L: 425 + } else { + throw new RuntimeException(); // L: 420 + } } - - return var0; } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 7a929671ad..b671afceb8 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,51 +2,24 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jj") @Implements("Calendar") public class Calendar { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; static { - MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; - 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("jx") - @ObfuscatedSignature( - descriptor = "(IIIILon;Liw;B)V", - garbageValue = "-108" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - class21.redHintArrowSprite.method7320(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - StudioGame.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - - } + 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 } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index a71458b236..23306f53af 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -2,207 +2,181 @@ import java.awt.Component; import java.awt.Graphics; import 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("d") +@ObfuscatedName("v") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("hx") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("io") - @ObfuscatedGetter( - intValue = -1379782225 + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lod;" ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("l") + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("i") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; - } + this.component = var1; // L: 11 + } // L: 12 public final void update(Graphics var1) { - this.component.update(var1); - } + this.component.update(var1); // L: 15 + } // L: 16 public final void paint(Graphics var1) { - this.component.paint(var1); - } + this.component.paint(var1); // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IILfw;Lfy;I)Z", - garbageValue = "-37817578" + descriptor = "(IB)Lfl;", + garbageValue = "80" ) - public static final boolean method381(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class174.directions[var6][var7] = 99; - class174.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class174.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class174.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class174.bufferX[var11]; - var5 = class174.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)) { - class318.field3870 = var4; - class174.field1994 = var5; - return true; - } - - int var15 = class174.distances[var16][var17] + 1; - if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class174.bufferX[var18] = var4 - 1; - class174.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class174.directions[var16 - 1][var17] = 2; - class174.distances[var16 - 1][var17] = var15; - } - - if (var16 < 126 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class174.bufferX[var18] = var4 + 1; - class174.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class174.directions[var16 + 1][var17] = 8; - class174.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class174.bufferX[var18] = var4; - class174.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class174.directions[var16][var17 - 1] = 1; - class174.distances[var16][var17 - 1] = var15; - } - - if (var17 < 126 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class174.bufferX[var18] = var4; - class174.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class174.directions[var16][var17 + 1] = 4; - class174.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class174.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) { - class174.bufferX[var18] = var4 - 1; - class174.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class174.directions[var16 - 1][var17 - 1] = 3; - class174.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 126 && var17 > 0 && class174.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) { - class174.bufferX[var18] = var4 + 1; - class174.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class174.directions[var16 + 1][var17 - 1] = 9; - class174.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 126 && class174.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) { - class174.bufferX[var18] = var4 - 1; - class174.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class174.directions[var16 - 1][var17 + 1] = 6; - class174.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 126 && var17 < 126 && class174.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) { - class174.bufferX[var18] = var4 + 1; - class174.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class174.directions[var16 + 1][var17 + 1] = 12; - class174.distances[var16 + 1][var17 + 1] = var15; - } - } - - class318.field3870 = var4; - class174.field1994 = var5; - return false; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1980998200" - ) - public static int method374(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { + public static HitSplatDefinition method372(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 + if (var1 != null) { // L: 53 return var1; - } else if (var2 == 1) { - return 7 - var0; } else { - return var2 == 2 ? 7 - var1 : var0; + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 + var1 = new HitSplatDefinition(); // L: 55 + if (var2 != null) { // L: 56 + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 + return var1; // L: 58 } } - @ObfuscatedName("a") + @ObfuscatedName("ha") @ObfuscatedSignature( - descriptor = "(I)Lbc;", - garbageValue = "154215174" + descriptor = "(ZLoj;I)V", + garbageValue = "-1681354127" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return AttackOption.getNextWorldListWorld(); - } + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5700 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5701 + var2 = var1.method7120(); // L: 5702 + var3 = var1.method7004(); // L: 5703 + int var4 = var1.readUnsignedShort(); // L: 5704 + Client.xteaKeys = new int[var4][4]; // L: 5705 - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "1354810212" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - ReflectionCheck.field452 = null; - ArchiveLoader.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (ReflectionCheck.field452 != null) { - ArchiveLoader.drawInterface(ReflectionCheck.field452, -1412584499, var1, var2, var3, var4, Script.field954, UserComparator3.field1338, var7); - ReflectionCheck.field452 = null; - } - - } else { - if (var7 != -1) { - Client.field710[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field710[var8] = true; + for (var5 = 0; var5 < var4; ++var5) { // L: 5706 + for (var6 = 0; var6 < 4; ++var6) { // L: 5707 + Client.xteaKeys[var5][var6] = var1.readInt(); // L: 5708 } } - } - } + LoginScreenAnimation.regions = new int[var4]; // L: 5711 + class119.regionMapArchiveIds = new int[var4]; // L: 5712 + class21.regionLandArchiveIds = new int[var4]; // L: 5713 + ModeWhere.regionLandArchives = new byte[var4][]; // L: 5714 + class184.regionMapArchives = new byte[var4][]; // L: 5715 + boolean var16 = false; // L: 5716 + if (Client.field619) { // L: 5717 + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5718 + var16 = true; + } - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "-34" - ) - static final void method380(int var0, int var1, int var2, boolean var3) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - WorldMapSection1.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); + if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5719 + var16 = true; + } + } + + var4 = 0; // L: 5721 + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5722 + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5723 + var8 = var7 + (var6 << 8); // L: 5724 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5725 + LoginScreenAnimation.regions[var4] = var8; // L: 5726 + class119.regionMapArchiveIds[var4] = class11.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5727 + class21.regionLandArchiveIds[var4] = class11.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5728 + ++var4; // L: 5729 + } + } + } + + EnumComposition.method3107(var3, var2, true); // L: 5732 + } else { + var2 = var1.method7120(); // L: 5735 + var3 = var1.readUnsignedShort(); // L: 5736 + boolean var15 = var1.readUnsignedByte() == 1; // L: 5737 + var5 = var1.readUnsignedShort(); // L: 5738 + var1.importIndex(); // L: 5739 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5740 + for (var7 = 0; var7 < 13; ++var7) { // L: 5741 + for (var8 = 0; var8 < 13; ++var8) { // L: 5742 + var9 = var1.readBits(1); // L: 5743 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5744 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5745 + } + } + } + } + + var1.exportIndex(); // L: 5749 + Client.xteaKeys = new int[var5][4]; // L: 5750 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5751 + for (var7 = 0; var7 < 4; ++var7) { // L: 5752 + Client.xteaKeys[var6][var7] = var1.readInt(); // L: 5753 + } + } + + LoginScreenAnimation.regions = new int[var5]; // L: 5756 + class119.regionMapArchiveIds = new int[var5]; // L: 5757 + class21.regionLandArchiveIds = new int[var5]; // L: 5758 + ModeWhere.regionLandArchives = new byte[var5][]; // L: 5759 + class184.regionMapArchives = new byte[var5][]; // L: 5760 + var5 = 0; // L: 5761 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5762 + for (var7 = 0; var7 < 13; ++var7) { // L: 5763 + for (var8 = 0; var8 < 13; ++var8) { // L: 5764 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5765 + if (var9 != -1) { // L: 5766 + int var10 = var9 >> 14 & 1023; // L: 5767 + int var11 = var9 >> 3 & 2047; // L: 5768 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5769 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5770 + if (LoginScreenAnimation.regions[var13] == var12) { + var12 = -1; // L: 5771 + break; // L: 5772 + } + } + + if (var12 != -1) { // L: 5774 + LoginScreenAnimation.regions[var5] = var12; // L: 5775 + var13 = var12 >> 8 & 255; // L: 5776 + int var14 = var12 & 255; // L: 5777 + class119.regionMapArchiveIds[var5] = class11.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5778 + class21.regionLandArchiveIds[var5] = class11.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5779 + ++var5; // L: 5780 + } + } + } + } + } + + EnumComposition.method3107(var2, var3, !var15); // L: 5786 } - } + + } // L: 5788 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 89c17edc34..aa9b44a998 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -3,280 +3,117 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bn") +@ObfuscatedName("be") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("q") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "[Lbo;" + descriptor = "Lkd;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "[Lbf;" ) @Export("messages") Message[] messages; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1188570889 + intValue = 1060618387 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; - } + this.messages = new Message[100]; // L: 85 + } // L: 88 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbo;", - garbageValue = "-1190035650" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbf;", + garbageValue = "-1998830550" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; + Message var5 = this.messages[99]; // L: 91 - for (int var6 = this.count; var6 > 0; --var6) { - if (var6 != 100) { - this.messages[var6] = this.messages[var6 - 1]; + for (int var6 = this.count; var6 > 0; --var6) { // L: 92 + if (var6 != 100) { // L: 93 + this.messages[var6] = this.messages[var6 - 1]; // L: 94 } } - if (var5 == null) { + if (var5 == null) { // L: 96 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); - var5.removeDual(); - var5.set(var1, var2, var4, var3); + var5.remove(); // L: 98 + var5.removeDual(); // L: 99 + var5.set(var1, var2, var4, var3); // L: 100 } - this.messages[0] = var5; - if (this.count < 100) { + this.messages[0] = var5; // L: 102 + if (this.count < 100) { // L: 103 ++this.count; } - return var5; + return var5; // L: 104 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)Lbo;", - garbageValue = "949402314" + descriptor = "(IB)Lbf;", + garbageValue = "5" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 108 109 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "44" + descriptor = "(I)I", + garbageValue = "-1220983055" ) @Export("size") int size() { - return this.count; + return this.count; // L: 113 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1709302378" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "558752868" ) - public static int method1978(int var0, int var1, int var2) { - int var3 = FloorOverlayDefinition.method3343(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; - return var0; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Loy;IB)Z", - garbageValue = "108" - ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - 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]; - var11.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var11.pathTraversed[0] = Players.field1245[var1]; - var11.plane = (byte)var8; - var11.resetPath((var9 << 13) + var3 - WorldMapSectionType.baseX, (var10 << 13) + var4 - PlayerComposition.baseY); - var11.field1060 = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); - return false; + public static byte[] method2013(Object var0, boolean var1) { + if (var0 == null) { // L: 8 + return null; + } else if (var0 instanceof byte[]) { // L: 9 + byte[] var3 = (byte[])((byte[])var0); // L: 10 + return var1 ? EnumComposition.method3106(var3) : var3; // L: 11 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 14 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15 + return var2.get(); // L: 16 } else { - int var5; - int var6; - 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 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var6 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var7 + var6 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } + throw new IllegalArgumentException(); // L: 18 } } - @ObfuscatedName("p") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "636323655" + descriptor = "(ILbp;ZI)I", + garbageValue = "1766338115" ) - static int method1987(int var0, Script var1, boolean var2) { - Widget var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 2615 && var0 != 2616) { - return 2; + static int method2012(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4328 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4329 + return 1; // L: 4330 + } else if (var0 == 6950) { // L: 4332 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4333 + return 1; // L: 4334 } else { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; + return 2; // L: 4336 } } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-662979450" - ) - static final void method1985() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - class116.updateActorSequence(var2, var2.definition.size); - } - } - - } } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index 68a632f186..7f40e22fac 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -7,208 +7,786 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("ea") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("l") - boolean field1522; - @ObfuscatedName("q") - boolean field1511; - @ObfuscatedName("f") + @ObfuscatedName("y") + public static short[][] field1512; + @ObfuscatedName("i") + boolean field1510; + @ObfuscatedName("w") + boolean field1518; + @ObfuscatedName("s") @Export("members") public List members; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 5432750622000558309L + longValue = -4755117634906331749L ) - long field1515; - @ObfuscatedName("k") + long field1514; + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("t") - public byte field1517; - @ObfuscatedName("a") - public byte field1512; + @ObfuscatedName("e") + public byte field1516; + @ObfuscatedName("p") + public byte field1511; static { - new BitSet(65536); - } + new BitSet(65536); // L: 22 + } // L: 23 @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) public ClanChannel(Buffer var1) { - this.field1511 = true; - this.name = null; - this.method2731(var1); - } + this.field1518 = true; // L: 13 + this.name = null; // L: 17 + this.method2806(var1); // L: 26 + } // L: 27 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-583573916" + descriptor = "(B)[I", + garbageValue = "32" ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { - String[] var1 = new String[this.members.size()]; - this.sortedMembers = new int[this.members.size()]; + if (this.sortedMembers == null) { // L: 30 + String[] var1 = new String[this.members.size()]; // L: 31 + this.sortedMembers = new int[this.members.size()]; // L: 32 - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7459(); + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7579(); // L: 34 } - int[] var3 = this.sortedMembers; - WorldMap.method6612(var1, var3, 0, var1.length - 1); + int[] var3 = this.sortedMembers; // L: 37 + class122.method2599(var1, var3, 0, var1.length - 1); // L: 39 } - return this.sortedMembers; + return this.sortedMembers; // L: 42 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldo;I)V", - garbageValue = "-1606907602" + descriptor = "(Lde;B)V", + garbageValue = "8" ) @Export("addMember") void addMember(ClanChannelMember var1) { - this.members.add(var1); - this.sortedMembers = null; - } + this.members.add(var1); // L: 46 + this.sortedMembers = null; // L: 47 + } // L: 48 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-82" + descriptor = "(II)V", + garbageValue = "-1989668553" ) @Export("removeMember") void removeMember(int var1) { - this.members.remove(var1); - this.sortedMembers = null; - } + this.members.remove(var1); // L: 51 + this.sortedMembers = null; // L: 52 + } // L: 53 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "33" + garbageValue = "-77" ) - public int method2729() { - return this.members.size(); + public int method2809() { + return this.members.size(); // L: 56 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1154960120" + garbageValue = "-328026821" ) - public int method2739(String var1) { - if (!this.field1511) { + public int method2817(String var1) { + if (!this.field1518) { // L: 60 throw new RuntimeException("Displaynames not available"); } else { - for (int var2 = 0; var2 < this.members.size(); ++var2) { + for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61 if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { - return var2; + return var2; // L: 62 } } - return -1; + return -1; // L: 64 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-1374408697" + descriptor = "(Lop;I)V", + garbageValue = "1502263315" ) - void method2731(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if ((var2 & 1) != 0) { - this.field1522 = true; + void method2806(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 68 + if ((var2 & 1) != 0) { // L: 69 + this.field1510 = true; } - if ((var2 & 2) != 0) { - this.field1511 = true; + if ((var2 & 2) != 0) { // L: 70 + this.field1518 = true; } - int var3 = 2; - if ((var2 & 4) != 0) { + int var3 = 2; // L: 71 + if ((var2 & 4) != 0) { // L: 72 var3 = var1.readUnsignedByte(); } - super.key = var1.readLong(); - this.field1515 = var1.readLong(); - this.name = var1.readStringCp1252NullTerminated(); - var1.readBoolean(); - this.field1512 = var1.readByte(); - this.field1517 = var1.readByte(); - int var4 = var1.readUnsignedShort(); - if (var4 > 0) { - this.members = new ArrayList(var4); + super.key = var1.readLong(); // L: 73 + this.field1514 = var1.readLong(); // L: 74 + this.name = var1.readStringCp1252NullTerminated(); // L: 75 + var1.readBoolean(); // L: 76 + this.field1511 = var1.readByte(); // L: 77 + this.field1516 = var1.readByte(); // L: 78 + int var4 = var1.readUnsignedShort(); // L: 79 + if (var4 > 0) { // L: 80 + this.members = new ArrayList(var4); // L: 81 - for (int var5 = 0; var5 < var4; ++var5) { - ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1522) { - var1.readLong(); + for (int var5 = 0; var5 < var4; ++var5) { // L: 82 + ClanChannelMember var6 = new ClanChannelMember(); // L: 83 + if (this.field1510) { // L: 84 + var1.readLong(); // L: 85 } - if (this.field1511) { + if (this.field1518) { // L: 87 var6.username = new Username(var1.readStringCp1252NullTerminated()); } - var6.rank = var1.readByte(); - var6.world = var1.readUnsignedShort(); - if (var3 >= 3) { - var1.readBoolean(); + var6.rank = var1.readByte(); // L: 88 + var6.world = var1.readUnsignedShort(); // L: 89 + if (var3 >= 3) { // L: 90 + var1.readBoolean(); // L: 91 } - this.members.add(var5, var6); + this.members.add(var5, var6); // L: 94 } } - } + } // L: 97 - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IB)Lel;", - garbageValue = "-34" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-894225257" ) - public static VarcInt method2747(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method2924(new Buffer(var2)); - } + public static int method2824(CharSequence var0) { + int var1 = var0.length(); // L: 147 + int var2 = 0; // L: 148 - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + for (int var3 = 0; var3 < var1; ++var3) { // L: 149 + var2 = (var2 << 5) - var2 + var0.charAt(var3); } + + return var2; // L: 150 } - @ObfuscatedName("k") + @ObfuscatedName("jh") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1415895326" + descriptor = "([Ljf;IIIIIIII)V", + garbageValue = "-879561434" ) - public static boolean method2748(int var0) { - return (var0 >> 21 & 1) != 0; - } + @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: 10628 + Widget var9 = var0[var8]; // L: 10629 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || PendingSpawn.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10630 10631 10632 + if (var9.isIf3) { // L: 10633 + if (Varcs.isComponentHidden(var9)) { // L: 10634 + continue; + } + } else if (var9.type == 0 && var9 != WorldMapData_0.mousedOverWidgetIf1 && Varcs.isComponentHidden(var9)) { // L: 10637 + continue; + } + + int var10 = var9.x + var6; // L: 10639 + int var11 = var7 + var9.y; // L: 10640 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10645 + var12 = var2; // L: 10646 + var13 = var3; // L: 10647 + var14 = var4; // L: 10648 + var15 = var5; // L: 10649 + } else { + int var16; + if (var9.type == 9) { // L: 10651 + var16 = var10; // L: 10652 + var17 = var11; // L: 10653 + var18 = var10 + var9.width; // L: 10654 + int var19 = var11 + var9.height; // L: 10655 + if (var18 < var10) { // L: 10656 + var16 = var18; // L: 10658 + var18 = var10; // L: 10659 + } + + if (var19 < var11) { // L: 10661 + var17 = var19; // L: 10663 + var19 = var11; // L: 10664 + } + + ++var18; // L: 10666 + ++var19; // L: 10667 + var12 = var16 > var2 ? var16 : var2; // L: 10668 + var13 = var17 > var3 ? var17 : var3; // L: 10669 + var14 = var18 < var4 ? var18 : var4; // L: 10670 + var15 = var19 < var5 ? var19 : var5; // L: 10671 + } else { + var16 = var10 + var9.width; // L: 10674 + var17 = var11 + var9.height; // L: 10675 + var12 = var10 > var2 ? var10 : var2; // L: 10676 + var13 = var11 > var3 ? var11 : var3; // L: 10677 + var14 = var16 < var4 ? var16 : var4; // L: 10678 + var15 = var17 < var5 ? var17 : var5; // L: 10679 + } + } + + if (var9 == Client.clickedWidget) { // L: 10681 + Client.field680 = true; // L: 10682 + Client.field652 = var10; // L: 10683 + Client.field468 = var11; // L: 10684 + } + + boolean var33 = false; // L: 10686 + if (var9.field3125) { // L: 10687 + switch(Client.field479) { // L: 10688 + case 0: + var33 = true; // L: 10695 + case 1: + default: + break; + case 2: + if (Client.field633 == var9.id >>> 16) { // L: 10698 + var33 = true; // L: 10699 + } + break; + case 3: + if (var9.id == Client.field633) { // L: 10690 + var33 = true; // L: 10691 + } + } + } + + if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10704 + if (var9.isIf3) { // L: 10705 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10706 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10707 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10708 + if (var26.isMouseInputEvent) { // L: 10709 + var26.remove(); // L: 10710 + var26.widget.containsMouse = false; // L: 10711 + } + } + + if (class134.widgetDragDuration == 0) { // L: 10714 + Client.clickedWidget = null; // L: 10715 + Client.clickedWidgetParent = null; // L: 10716 + } + + if (!Client.isMenuOpen) { // L: 10718 + FriendSystem.addCancelMenuEntry(); // L: 10719 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10723 10724 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10725 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10726 + var26.remove(); // L: 10727 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10733 + var18 = MouseHandler.MouseHandler_y; // L: 10734 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10735 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10736 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10737 + } + + boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10739 + if (var9.contentType == 1337) { // L: 10740 + if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 10741 + DevicePcmPlayerProvider.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10744 + class1.checkIfMinimapClicked(var9, var10, var11); // L: 10745 + } else { + if (var9.contentType == 1400) { // L: 10748 + class133.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 10749 + } + + if (!Client.isMenuOpen && var34) { // L: 10751 + if (var9.contentType == 1400) { // L: 10752 + class133.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10753 + } else { + class114.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10756 + } + } + + boolean var21; + int var23; + if (var33) { // L: 10759 + for (int var20 = 0; var20 < var9.field3180.length; ++var20) { // L: 10760 + var21 = false; // L: 10761 + boolean var27 = false; // L: 10762 + if (!var21 && var9.field3180[var20] != null) { // L: 10763 + for (var23 = 0; var23 < var9.field3180[var20].length; ++var23) { // L: 10764 + boolean var24 = false; // L: 10765 + if (var9.field3194 != null) { // L: 10766 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3180[var20][var23]]; // L: 10767 + } + + if (InterfaceParent.method2080(var9.field3180[var20][var23]) || var24) { // L: 10769 + var21 = true; // L: 10770 + if (var9.field3194 != null && var9.field3194[var20] > Client.cycle) { // L: 10771 + break; + } + + byte var32 = var9.field3105[var20][var23]; // L: 10772 + 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: 10773 10774 10775 10776 10777 + var27 = true; // L: 10779 + break; + } + } + } + } + + if (var27) { // L: 10785 + if (var20 < 10) { // L: 10786 + GrandExchangeEvents.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10787 + class262.Widget_runOnTargetLeave(); // L: 10788 + Decimator.selectSpell(var9.id, var9.childIndex, SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var9)), var9.itemId); // L: 10789 + Client.selectedSpellActionName = class20.Widget_getSpellActionName(var9); // L: 10790 + if (Client.selectedSpellActionName == null) { // L: 10791 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + MouseHandler.colorStartTag(16777215); // L: 10792 + } + + var23 = var9.field3128[var20]; // L: 10794 + if (var9.field3194 == null) { // L: 10795 + var9.field3194 = new int[var9.field3180.length]; + } + + if (var9.field3129 == null) { // L: 10796 + var9.field3129 = new int[var9.field3180.length]; + } + + if (var23 != 0) { // L: 10797 + if (var9.field3194[var20] == 0) { // L: 10798 + var9.field3194[var20] = var23 + Client.cycle + var9.field3129[var20]; + } else { + var9.field3194[var20] = var23 + Client.cycle; // L: 10799 + } + } else { + var9.field3194[var20] = Integer.MAX_VALUE; // L: 10801 + } + } + + if (!var21 && var9.field3194 != null) { // L: 10803 10804 + var9.field3194[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10808 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10809 + var34 = true; + } else { + var34 = false; // L: 10810 + } + + boolean var35 = false; // L: 10811 + if ((MouseHandler.MouseHandler_currentButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 10812 + var35 = true; + } + + var21 = false; // L: 10813 + if ((MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10814 + var21 = true; + } + + if (var21) { // L: 10815 + UserComparator6.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10816 + class133.worldMap.method6625(var17, var18, var34 & var35, var34 & var21); // L: 10817 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && PlayerComposition.method5067(PendingSpawn.getWidgetFlags(var9))) { // L: 10819 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10820 + Client.field648 = true; // L: 10821 + Client.field649 = var10; // L: 10822 + Client.field650 = var11; // L: 10823 + } + + if (var9.hasListener) { // L: 10825 + ScriptEvent var22; + if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10826 + var22 = new ScriptEvent(); // L: 10827 + var22.isMouseInputEvent = true; // L: 10828 + var22.widget = var9; // L: 10829 + var22.mouseY = Client.mouseWheelRotation; // L: 10830 + var22.args = var9.onScroll; // L: 10831 + Client.scriptEvents.addFirst(var22); // L: 10832 + } + + if (Client.clickedWidget != null || class247.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10834 + var21 = false; // L: 10835 + var35 = false; // L: 10836 + var34 = false; // L: 10837 + } + + if (!var9.isClicked && var21) { // L: 10839 + var9.isClicked = true; // L: 10840 + if (var9.onClick != null) { // L: 10841 + var22 = new ScriptEvent(); // L: 10842 + var22.isMouseInputEvent = true; // L: 10843 + var22.widget = var9; // L: 10844 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10845 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10846 + var22.args = var9.onClick; // L: 10847 + Client.scriptEvents.addFirst(var22); // L: 10848 + } + } + + if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 10851 10852 + var22 = new ScriptEvent(); // L: 10853 + var22.isMouseInputEvent = true; // L: 10854 + var22.widget = var9; // L: 10855 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10856 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10857 + var22.args = var9.onClickRepeat; // L: 10858 + Client.scriptEvents.addFirst(var22); // L: 10859 + } + + if (var9.isClicked && !var35) { // L: 10862 + var9.isClicked = false; // L: 10863 + if (var9.onRelease != null) { // L: 10864 + var22 = new ScriptEvent(); // L: 10865 + var22.isMouseInputEvent = true; // L: 10866 + var22.widget = var9; // L: 10867 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10868 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10869 + var22.args = var9.onRelease; // L: 10870 + Client.field675.addFirst(var22); // L: 10871 + } + } + + if (var35 && var9.onHold != null) { // L: 10874 10875 + var22 = new ScriptEvent(); // L: 10876 + var22.isMouseInputEvent = true; // L: 10877 + var22.widget = var9; // L: 10878 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10879 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10880 + var22.args = var9.onHold; // L: 10881 + Client.scriptEvents.addFirst(var22); // L: 10882 + } + + if (!var9.containsMouse && var34) { // L: 10885 + var9.containsMouse = true; // L: 10886 + if (var9.onMouseOver != null) { // L: 10887 + var22 = new ScriptEvent(); // L: 10888 + var22.isMouseInputEvent = true; // L: 10889 + var22.widget = var9; // L: 10890 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10891 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10892 + var22.args = var9.onMouseOver; // L: 10893 + Client.scriptEvents.addFirst(var22); // L: 10894 + } + } + + if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 10897 10898 + var22 = new ScriptEvent(); // L: 10899 + var22.isMouseInputEvent = true; // L: 10900 + var22.widget = var9; // L: 10901 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10902 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10903 + var22.args = var9.onMouseRepeat; // L: 10904 + Client.scriptEvents.addFirst(var22); // L: 10905 + } + + if (var9.containsMouse && !var34) { // L: 10908 + var9.containsMouse = false; // L: 10909 + if (var9.onMouseLeave != null) { // L: 10910 + var22 = new ScriptEvent(); // L: 10911 + var22.isMouseInputEvent = true; // L: 10912 + var22.widget = var9; // L: 10913 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10914 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10915 + var22.args = var9.onMouseLeave; // L: 10916 + Client.field675.addFirst(var22); // L: 10917 + } + } + + if (var9.onTimer != null) { // L: 10920 + var22 = new ScriptEvent(); // L: 10921 + var22.widget = var9; // L: 10922 + var22.args = var9.onTimer; // L: 10923 + Client.field674.addFirst(var22); // L: 10924 + } + + ScriptEvent var25; + int var36; + int var37; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3189) { // L: 10926 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3189 <= 32) { // L: 10927 + label818: + for (var37 = var9.field3189; var37 < Client.changedVarpCount; ++var37) { // L: 10934 + var23 = Client.changedVarps[var37 & 31]; // L: 10935 + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 10936 + if (var23 == var9.varTransmitTriggers[var36]) { // L: 10937 + var25 = new ScriptEvent(); // L: 10938 + var25.widget = var9; // L: 10939 + var25.args = var9.onVarTransmit; // L: 10940 + Client.scriptEvents.addFirst(var25); // L: 10941 + break label818; // L: 10942 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10928 + var22.widget = var9; // L: 10929 + var22.args = var9.onVarTransmit; // L: 10930 + Client.scriptEvents.addFirst(var22); // L: 10931 + } + + var9.field3189 = Client.changedVarpCount; // L: 10947 + } + + if (var9.onInvTransmit != null && Client.field659 > var9.field3073) { // L: 10949 + if (var9.invTransmitTriggers != null && Client.field659 - var9.field3073 <= 32) { // L: 10950 + label794: + for (var37 = var9.field3073; var37 < Client.field659; ++var37) { // L: 10957 + var23 = Client.changedItemContainers[var37 & 31]; // L: 10958 + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 10959 + if (var23 == var9.invTransmitTriggers[var36]) { // L: 10960 + var25 = new ScriptEvent(); // L: 10961 + var25.widget = var9; // L: 10962 + var25.args = var9.onInvTransmit; // L: 10963 + Client.scriptEvents.addFirst(var25); // L: 10964 + break label794; // L: 10965 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10951 + var22.widget = var9; // L: 10952 + var22.args = var9.onInvTransmit; // L: 10953 + Client.scriptEvents.addFirst(var22); // L: 10954 + } + + var9.field3073 = Client.field659; // L: 10970 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3191) { // L: 10972 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3191 <= 32) { // L: 10973 + label770: + for (var37 = var9.field3191; var37 < Client.changedSkillsCount; ++var37) { // L: 10980 + var23 = Client.changedSkills[var37 & 31]; // L: 10981 + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 10982 + if (var23 == var9.statTransmitTriggers[var36]) { // L: 10983 + var25 = new ScriptEvent(); // L: 10984 + var25.widget = var9; // L: 10985 + var25.args = var9.onStatTransmit; // L: 10986 + Client.scriptEvents.addFirst(var25); // L: 10987 + break label770; // L: 10988 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10974 + var22.widget = var9; // L: 10975 + var22.args = var9.onStatTransmit; // L: 10976 + Client.scriptEvents.addFirst(var22); // L: 10977 + } + + var9.field3191 = Client.changedSkillsCount; // L: 10993 + } + + if (Client.chatCycle > var9.field3188 && var9.onChatTransmit != null) { // L: 10995 + var22 = new ScriptEvent(); // L: 10996 + var22.widget = var9; // L: 10997 + var22.args = var9.onChatTransmit; // L: 10998 + Client.scriptEvents.addFirst(var22); // L: 10999 + } + + if (Client.field679 > var9.field3188 && var9.onFriendTransmit != null) { // L: 11001 + var22 = new ScriptEvent(); // L: 11002 + var22.widget = var9; // L: 11003 + var22.args = var9.onFriendTransmit; // L: 11004 + Client.scriptEvents.addFirst(var22); // L: 11005 + } + + if (Client.field666 > var9.field3188 && var9.onClanTransmit != null) { // L: 11007 + var22 = new ScriptEvent(); // L: 11008 + var22.widget = var9; // L: 11009 + var22.args = var9.onClanTransmit; // L: 11010 + Client.scriptEvents.addFirst(var22); // L: 11011 + } + + if (Client.field681 > var9.field3188 && var9.field3056 != null) { // L: 11013 + var22 = new ScriptEvent(); // L: 11014 + var22.widget = var9; // L: 11015 + var22.args = var9.field3056; // L: 11016 + Client.scriptEvents.addFirst(var22); // L: 11017 + } + + if (Client.field724 > var9.field3188 && var9.field3166 != null) { // L: 11019 + var22 = new ScriptEvent(); // L: 11020 + var22.widget = var9; // L: 11021 + var22.args = var9.field3166; // L: 11022 + Client.scriptEvents.addFirst(var22); // L: 11023 + } + + if (Client.field536 > var9.field3188 && var9.onStockTransmit != null) { // L: 11025 + var22 = new ScriptEvent(); // L: 11026 + var22.widget = var9; // L: 11027 + var22.args = var9.onStockTransmit; // L: 11028 + Client.scriptEvents.addFirst(var22); // L: 11029 + } + + if (Client.field670 > var9.field3188 && var9.field3172 != null) { // L: 11031 + var22 = new ScriptEvent(); // L: 11032 + var22.widget = var9; // L: 11033 + var22.args = var9.field3172; // L: 11034 + Client.scriptEvents.addFirst(var22); // L: 11035 + } + + if (Client.field494 > var9.field3188 && var9.onMiscTransmit != null) { // L: 11037 + var22 = new ScriptEvent(); // L: 11038 + var22.widget = var9; // L: 11039 + var22.args = var9.onMiscTransmit; // L: 11040 + Client.scriptEvents.addFirst(var22); // L: 11041 + } + + var9.field3188 = Client.cycleCntr; // L: 11043 + if (var9.onKey != null) { // L: 11044 + for (var37 = 0; var37 < Client.field695; ++var37) { // L: 11045 + ScriptEvent var31 = new ScriptEvent(); // L: 11046 + var31.widget = var9; // L: 11047 + var31.keyTyped = Client.field697[var37]; // L: 11048 + var31.keyPressed = Client.field696[var37]; // L: 11049 + var31.args = var9.onKey; // L: 11050 + Client.scriptEvents.addFirst(var31); // L: 11051 + } + } + + ScriptEvent var30; + int[] var38; + if (var9.field3161 != null) { // L: 11054 + var38 = class7.method57(); // L: 11055 + + for (var23 = 0; var23 < var38.length; ++var23) { // L: 11056 + var30 = new ScriptEvent(); // L: 11057 + var30.widget = var9; // L: 11058 + var30.keyTyped = var38[var23]; // L: 11059 + var30.args = var9.field3161; // L: 11060 + Client.scriptEvents.addFirst(var30); // L: 11061 + } + } + + if (var9.field3162 != null) { // L: 11064 + var38 = TaskHandler.method2879(); // L: 11065 + + for (var23 = 0; var23 < var38.length; ++var23) { // L: 11066 + var30 = new ScriptEvent(); // L: 11067 + var30.widget = var9; // L: 11068 + var30.keyTyped = var38[var23]; // L: 11069 + var30.args = var9.field3162; // L: 11070 + Client.scriptEvents.addFirst(var30); // L: 11071 + } + } + } + } + + if (!var9.isIf3) { // L: 11076 + if (Client.clickedWidget != null || class247.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11077 + 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: 11078 + if (var9.mouseOverRedirect >= 0) { // L: 11079 + WorldMapData_0.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + WorldMapData_0.mousedOverWidgetIf1 = var9; // L: 11080 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11082 + Skills.field3247 = var9; // L: 11083 + } + + if (var9.scrollHeight > var9.height) { // L: 11085 + class13.method177(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 11087 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 11088 + if (var9.children != null) { // L: 11089 + 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: 11090 + if (var28 != null) { // L: 11091 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11092 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11093 + if (var29.isMouseInputEvent) { // L: 11094 + var29.remove(); // L: 11095 + var29.widget.containsMouse = false; // L: 11096 + } + } + + if (class134.widgetDragDuration == 0) { // L: 11099 + Client.clickedWidget = null; // L: 11100 + Client.clickedWidgetParent = null; // L: 11101 + } + + if (!Client.isMenuOpen) { // L: 11103 + FriendSystem.addCancelMenuEntry(); // L: 11104 + } + } + + Messages.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 11107 + } + } + } + } + } + } + + } // L: 11111 + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "76" + ) + static final void method2825(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11409 + class408.clientPreferences.areaSoundEffectsVolume = var0; // L: 11410 + Login.savePreferences(); // L: 11411 + } // L: 11412 } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index 2cfb65589f..953209ceb4 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -4,31 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("de") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("rank") public byte rank; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -817842065 + intValue = 717344231 ) @Export("world") public int world; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpb;" ) @Export("username") public Username username; ClanChannelMember() { + } // L: 10 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1349383488" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 77 + if (var1 == null) { // L: 78 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 79 80 + } } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index aecb231e05..6657bbd29f 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,92 +3,97 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lp") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Loe;" + ) + static IndexedSprite field3950; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lmv;" ) @Export("friend") TriBool friend; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("ignored") TriBool ignored; ClanMate() { - this.friend = TriBool.TriBool_unknown; - this.ignored = TriBool.TriBool_unknown; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-31734" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.friend = TriBool.TriBool_unknown; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "393373028" - ) - @Export("isFriend") - public final boolean isFriend() { - if (this.friend == TriBool.TriBool_unknown) { - this.fillIsFriend(); - } - - return this.friend == TriBool.TriBool_true; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-13" - ) - @Export("fillIsFriend") - void fillIsFriend() { - this.friend = Message.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1505172516" - ) - @Export("clearIsIgnored") - void clearIsIgnored() { - this.ignored = TriBool.TriBool_unknown; - } + this.friend = TriBool.TriBool_unknown; // L: 6 + this.ignored = TriBool.TriBool_unknown; // L: 7 + } // L: 9 @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-528525433" + descriptor = "(I)V", + garbageValue = "-519741566" ) - @Export("isIgnored") - public final boolean isIgnored() { - if (this.ignored == TriBool.TriBool_unknown) { - this.fillIsIgnored(); + @Export("clearIsFriend") + void clearIsFriend() { + this.friend = TriBool.TriBool_unknown; // L: 12 + } // L: 13 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1866693709" + ) + @Export("isFriend") + public final boolean isFriend() { + if (this.friend == TriBool.TriBool_unknown) { // L: 16 + this.fillIsFriend(); // L: 17 } - return this.ignored == TriBool.TriBool_true; + return this.friend == TriBool.TriBool_true; // L: 19 } + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-587982231" + ) + @Export("fillIsFriend") + void fillIsFriend() { + this.friend = class112.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + } // L: 24 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-45" + ) + @Export("clearIsIgnored") + void clearIsIgnored() { + this.ignored = TriBool.TriBool_unknown; // L: 27 + } // L: 28 + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2082229769" + descriptor = "(B)Z", + garbageValue = "-2" + ) + @Export("isIgnored") + public final boolean isIgnored() { + if (this.ignored == TriBool.TriBool_unknown) { // L: 31 + this.fillIsIgnored(); // L: 32 + } + + return this.ignored == TriBool.TriBool_true; // L: 34 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "28" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = Message.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } + this.ignored = class112.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + } // L: 39 } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index 75add4a89d..8349d17d34 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -4,174 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("dm") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("q") + @ObfuscatedName("uu") + @ObfuscatedSignature( + descriptor = "Lkv;" + ) + public static class300 field1440; + @ObfuscatedName("tw") + @ObfuscatedGetter( + intValue = -1256129645 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("w") @Export("useHashes") boolean useHashes; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("useNames") boolean useNames; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 7796320747279199629L + longValue = 7512820562405009479L ) - long field1446; - @ObfuscatedName("m") + long field1456; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1295795639 + intValue = 83798711 ) - int field1447; - @ObfuscatedName("k") + int field1465; + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1935991065 + intValue = 627794383 ) - int field1449; - @ObfuscatedName("a") + int field1442; + @ObfuscatedName("p") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("e") - public byte field1450; - @ObfuscatedName("i") - public byte field1452; + @ObfuscatedName("j") + public byte field1444; + @ObfuscatedName("b") + public byte field1439; + @ObfuscatedName("x") + public byte field1446; @ObfuscatedName("y") - public byte field1459; - @ObfuscatedName("w") - public byte field1466; - @ObfuscatedName("g") + public byte field1447; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1332721669 + intValue = 287156229 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("b") - int[] field1463; - @ObfuscatedName("x") - public int[] field1460; - @ObfuscatedName("p") - public boolean[] field1461; + @ObfuscatedName("n") + int[] field1452; @ObfuscatedName("z") + public int[] field1453; + @ObfuscatedName("q") + public boolean[] field1454; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1162827635 + intValue = -1564397769 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 236960675 + intValue = 1945382455 ) - public int field1451; - @ObfuscatedName("o") + public int field1438; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 999682497 + intValue = -1604545471 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) public ClanSettings(Buffer var1) { - this.field1447 = 0; - this.name = null; - this.field1449 = 0; - this.currentOwner = -1; - this.field1451 = -1; - this.method2601(var1); - } + this.field1465 = 0; // L: 14 + this.name = null; // L: 15 + this.field1442 = 0; // L: 16 + this.currentOwner = -1; // L: 29 + this.field1438 = -1; // L: 30 + this.method2715(var1); // L: 43 + } // L: 44 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "404680173" + descriptor = "(IB)V", + garbageValue = "-21" ) - void method2582(int var1) { - if (this.useHashes) { - if (this.memberHashes != null) { + void method2650(int var1) { + if (this.useHashes) { // L: 47 + if (this.memberHashes != null) { // L: 48 System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); } else { - this.memberHashes = new long[var1]; + this.memberHashes = new long[var1]; // L: 49 } } - if (this.useNames) { - if (this.memberNames != null) { + if (this.useNames) { // L: 51 + if (this.memberNames != null) { // L: 52 System.arraycopy(this.memberNames, 0, this.memberNames = new String[var1], 0, this.memberCount); } else { - this.memberNames = new String[var1]; + this.memberNames = new String[var1]; // L: 53 } } if (this.memberRanks != null) { - System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); + System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); // L: 55 } else { - this.memberRanks = new byte[var1]; + this.memberRanks = new byte[var1]; // L: 56 } - if (this.field1463 != null) { - System.arraycopy(this.field1463, 0, this.field1463 = new int[var1], 0, this.memberCount); + if (this.field1452 != null) { // L: 57 + System.arraycopy(this.field1452, 0, this.field1452 = new int[var1], 0, this.memberCount); } else { - this.field1463 = new int[var1]; + this.field1452 = new int[var1]; // L: 58 } - if (this.field1460 != null) { - System.arraycopy(this.field1460, 0, this.field1460 = new int[var1], 0, this.memberCount); + if (this.field1453 != null) { // L: 59 + System.arraycopy(this.field1453, 0, this.field1453 = new int[var1], 0, this.memberCount); } else { - this.field1460 = new int[var1]; + this.field1453 = new int[var1]; // L: 60 } - if (this.field1461 != null) { - System.arraycopy(this.field1461, 0, this.field1461 = new boolean[var1], 0, this.memberCount); + if (this.field1454 != null) { // L: 61 + System.arraycopy(this.field1454, 0, this.field1454 = new boolean[var1], 0, this.memberCount); } else { - this.field1461 = new boolean[var1]; + this.field1454 = new boolean[var1]; // L: 62 } - } + } // L: 63 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-390978502" + garbageValue = "1402687223" ) - void method2602(int var1) { + void method2711(int var1) { if (this.useHashes) { if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); } else { - this.bannedMemberHashes = new long[var1]; + this.bannedMemberHashes = new long[var1]; // L: 68 } } - if (this.useNames) { - if (this.bannedMemberNames != null) { + if (this.useNames) { // L: 70 + if (this.bannedMemberNames != null) { // L: 71 System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); } else { this.bannedMemberNames = new String[var1]; @@ -180,585 +191,600 @@ public class ClanSettings { } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1080888296" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "0" ) - public int method2584(String var1) { - if (var1 != null && var1.length() != 0) { - for (int var2 = 0; var2 < this.memberCount; ++var2) { - if (this.memberNames[var2].equals(var1)) { + public int method2649(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 return var2; } } - return -1; + return -1; // L: 81 } else { return -1; } } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "45" - ) - public int method2585(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1463[var1] & var4) >>> var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Integer;", - garbageValue = "26" - ) - @Export("getTitleGroupValue") - public Integer getTitleGroupValue(int var1) { - if (this.parameters == null) { - return null; - } else { - Node var2 = this.parameters.get((long)var1); - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1998425612" - ) - @Export("getSortedMembers") - public int[] getSortedMembers() { - 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++) { - var1[var2] = this.memberNames[var2]; - if (var1[var2] != null) { - var1[var2] = var1[var2].toLowerCase(); - } - } - - int[] var3 = this.sortedMembers; - WorldMap.method6612(var1, var3, 0, var1.length - 1); - } - - return this.sortedMembers; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;IB)V", - garbageValue = "60" - ) - void method2646(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { - var3 = null; - } - - if (var1 > 0L != this.useHashes) { - throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { - 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)) { - this.method2582(this.memberCount + 5); - } - - if (this.memberHashes != null) { - this.memberHashes[this.memberCount] = var1; - } - - if (this.memberNames != null) { - this.memberNames[this.memberCount] = var3; - } - - if (this.currentOwner == -1) { - this.currentOwner = this.memberCount; - this.memberRanks[this.memberCount] = 126; - } else { - this.memberRanks[this.memberCount] = 0; - } - - this.field1463[this.memberCount] = 0; - this.field1460[this.memberCount] = var4; - this.field1461[this.memberCount] = false; - ++this.memberCount; - this.sortedMembers = null; - } - } - @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "23" + descriptor = "(IIIB)I", + garbageValue = "-83" ) - void method2589(int var1) { - 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.field1463 = null; - this.field1460 = null; - this.field1461 = null; - this.currentOwner = -1; - this.field1451 = -1; - } else { - System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1463, var1 + 1, this.field1463, var1, this.memberCount - var1); - System.arraycopy(this.field1460, var1 + 1, this.field1460, var1, this.memberCount - var1); - System.arraycopy(this.field1461, var1 + 1, this.field1461, var1, this.memberCount - var1); - if (this.memberHashes != null) { - System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); - } - - if (this.memberNames != null) { - System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); - } - - this.updateOwner(); - } - - } else { - throw new RuntimeException(""); - } + public int method2652(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 + return (this.field1452[var1] & var4) >>> var2; // L: 86 } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-878605016" + descriptor = "(II)Ljava/lang/Integer;", + garbageValue = "688025424" ) - @Export("updateOwner") - void updateOwner() { - if (this.memberCount == 0) { - this.currentOwner = -1; - this.field1451 = -1; + @Export("getTitleGroupValue") + public Integer getTitleGroupValue(int var1) { + if (this.parameters == null) { // L: 90 + return null; } else { - this.currentOwner = -1; - this.field1451 = -1; - int var1 = 0; - byte var2 = this.memberRanks[0]; - - for (int var3 = 1; var3 < this.memberCount; ++var3) { - if (this.memberRanks[var3] > var2) { - if (var2 == 125) { - this.field1451 = var1; - } - - var1 = var3; - var2 = this.memberRanks[var3]; - } else if (this.field1451 == -1 && this.memberRanks[var3] == 125) { - this.field1451 = var3; - } - } - - this.currentOwner = var1; - if (this.currentOwner != -1) { - this.memberRanks[this.currentOwner] = 126; - } - - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)V", - garbageValue = "2091341339" - ) - void method2637(long var1, String var3) { - if (var3 != null && var3.length() == 0) { - var3 = null; - } - - if (this.useHashes != var1 > 0L) { - throw new RuntimeException(""); - } 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)) { - this.method2602(this.bannedMemberCount + 5); - } - - if (this.bannedMemberHashes != null) { - this.bannedMemberHashes[this.bannedMemberCount] = var1; - } - - if (this.bannedMemberNames != null) { - this.bannedMemberNames[this.bannedMemberCount] = var3; - } - - ++this.bannedMemberCount; - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1252789986" - ) - void method2592(int var1) { - --this.bannedMemberCount; - if (this.bannedMemberCount == 0) { - this.bannedMemberHashes = null; - this.bannedMemberNames = null; - } else { - 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); - } - } - - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IBS)I", - garbageValue = "-6827" - ) - int method2619(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1451 == -1 || this.memberRanks[this.field1451] < 125)) { - return -1; - } else if (this.memberRanks[var1] == var2) { - return -1; - } else { - this.memberRanks[var1] = var2; - this.updateOwner(); - return var1; - } - } else { - return -1; + Node var2 = this.parameters.get((long)var1); // L: 91 + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1553488108" + descriptor = "(I)[I", + garbageValue = "-723355828" ) - boolean method2594(int var1) { - if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { - this.memberRanks[this.currentOwner] = 125; - this.field1451 = this.currentOwner; - this.memberRanks[var1] = 126; - this.currentOwner = var1; - return true; + @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 + + 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 + var1[var2] = var1[var2].toLowerCase(); + } + } + + BufferedSource.method6301(var1, this.sortedMembers); // L: 105 + } + + return this.sortedMembers; // L: 107 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;IB)V", + garbageValue = "86" + ) + void method2655(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { // L: 111 + var3 = null; + } + + if (var1 > 0L != this.useHashes) { // L: 112 + throw new RuntimeException(""); + } else if (var3 != null != this.useNames) { // L: 113 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114 + this.method2650(this.memberCount + 5); + } + + if (this.memberHashes != null) { // L: 115 + this.memberHashes[this.memberCount] = var1; + } + + if (this.memberNames != null) { // L: 116 + this.memberNames[this.memberCount] = var3; + } + + if (this.currentOwner == -1) { // L: 117 + this.currentOwner = this.memberCount; // L: 118 + this.memberRanks[this.memberCount] = 126; // L: 119 + } else { + this.memberRanks[this.memberCount] = 0; // L: 122 + } + + this.field1452[this.memberCount] = 0; // L: 124 + this.field1453[this.memberCount] = var4; // L: 125 + this.field1454[this.memberCount] = false; // L: 126 + ++this.memberCount; // L: 127 + this.sortedMembers = null; // L: 128 + } + } // L: 129 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1629682496" + ) + void method2656(int var1) { + if (var1 >= 0 && var1 < this.memberCount) { // L: 132 + --this.memberCount; // L: 133 + this.sortedMembers = null; // L: 134 + if (this.memberCount == 0) { // L: 135 + this.memberHashes = null; // L: 136 + this.memberNames = null; // L: 137 + this.memberRanks = null; // L: 138 + this.field1452 = null; // L: 139 + this.field1453 = null; // L: 140 + this.field1454 = null; // L: 141 + this.currentOwner = -1; // L: 142 + this.field1438 = -1; // L: 143 + } else { + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146 + System.arraycopy(this.field1452, var1 + 1, this.field1452, var1, this.memberCount - var1); // L: 147 + System.arraycopy(this.field1453, var1 + 1, this.field1453, var1, this.memberCount - var1); // L: 148 + System.arraycopy(this.field1454, var1 + 1, this.field1454, var1, this.memberCount - var1); // L: 149 + if (this.memberHashes != null) { // L: 150 + System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); + } + + if (this.memberNames != null) { // L: 151 + System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); + } + + this.updateOwner(); // L: 152 + } + + } else { + throw new RuntimeException(""); + } + } // L: 154 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-67" + ) + @Export("updateOwner") + void updateOwner() { + if (this.memberCount == 0) { // L: 157 + this.currentOwner = -1; // L: 158 + this.field1438 = -1; // L: 159 + } else { + this.currentOwner = -1; // L: 162 + this.field1438 = -1; // L: 163 + int var1 = 0; // L: 164 + byte var2 = this.memberRanks[0]; // L: 165 + + for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166 + if (this.memberRanks[var3] > var2) { // L: 167 + if (var2 == 125) { + this.field1438 = var1; // L: 168 + } + + var1 = var3; // L: 169 + var2 = this.memberRanks[var3]; // L: 170 + } else if (this.field1438 == -1 && this.memberRanks[var3] == 125) { // L: 172 + this.field1438 = var3; // L: 173 + } + } + + this.currentOwner = var1; // L: 176 + if (this.currentOwner != -1) { // L: 177 + this.memberRanks[this.currentOwner] = 126; + } + + } + } // L: 160 178 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;I)V", + garbageValue = "1006184517" + ) + void method2658(long var1, String var3) { + if (var3 != null && var3.length() == 0) { // L: 181 + var3 = null; + } + + if (var1 > 0L != this.useHashes) { // L: 182 + throw new RuntimeException(""); + } else if (this.useNames != (var3 != null)) { // L: 183 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184 + this.method2711(this.bannedMemberCount + 5); + } + + if (this.bannedMemberHashes != null) { // L: 185 + this.bannedMemberHashes[this.bannedMemberCount] = var1; + } + + if (this.bannedMemberNames != null) { // L: 186 + this.bannedMemberNames[this.bannedMemberCount] = var3; + } + + ++this.bannedMemberCount; // L: 187 + } + } // L: 188 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-465841653" + ) + void method2687(int var1) { + --this.bannedMemberCount; // L: 191 + if (this.bannedMemberCount == 0) { // L: 192 + this.bannedMemberHashes = null; // L: 193 + this.bannedMemberNames = null; // L: 194 + } else { + if (this.bannedMemberHashes != null) { // L: 197 + System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); + } + + if (this.bannedMemberNames != null) { + System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198 + } + } + + } // L: 200 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IBI)I", + garbageValue = "-1408414552" + ) + int method2673(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { // L: 203 + if (this.currentOwner == var1 && (this.field1438 == -1 || this.memberRanks[this.field1438] < 125)) { // L: 204 + return -1; + } else if (this.memberRanks[var1] == var2) { // L: 205 + return -1; + } else { + this.memberRanks[var1] = var2; // L: 206 + this.updateOwner(); // L: 207 + return var1; // L: 208 + } + } else { + return -1; + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1614826959" + ) + boolean method2661(int var1) { + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212 + this.memberRanks[this.currentOwner] = 125; // L: 213 + this.field1438 = this.currentOwner; // L: 214 + this.memberRanks[var1] = 126; // L: 215 + this.currentOwner = var1; // L: 216 + return true; // L: 217 } else { return false; } } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "976194960" + descriptor = "(IZB)I", + garbageValue = "32" ) - int method2595(int var1, boolean var2) { - if (this.field1461[var1] == var2) { + int method2662(int var1, boolean var2) { + if (this.field1454[var1] == var2) { // L: 221 return -1; } else { - this.field1461[var1] = var2; - return var1; + this.field1454[var1] = var2; // L: 222 + return var1; // L: 223 } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIIB)I", - garbageValue = "2" + garbageValue = "1" ) - int method2596(int var1, int var2, int var3, int var4) { - 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.field1463[var1]; + int method2663(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 227 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228 + int var7 = var6 ^ var5; // L: 229 + var2 <<= var3; // L: 230 + var2 &= var7; // L: 231 + int var8 = this.field1452[var1]; // L: 232 if ((var8 & var7) == var2) { - return -1; + return -1; // L: 233 } else { - var8 &= ~var7; - this.field1463[var1] = var8 | var2; - return var1; + var8 &= ~var7; // L: 234 + this.field1452[var1] = var8 | var2; // L: 235 + return var1; // L: 236 } } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2016619423" + garbageValue = "1591029993" ) - boolean method2597(int var1, int var2) { - 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) { + boolean method2664(int var1, int var2) { + if (this.parameters != null) { // L: 240 + Node var3 = this.parameters.get((long)var1); // L: 241 + if (var3 != null) { // L: 242 + if (var3 instanceof IntegerNode) { // L: 243 + IntegerNode var4 = (IntegerNode)var3; // L: 244 + if (var2 == var4.integer) { // L: 245 return false; } - var4.integer = var2; - return true; + var4.integer = var2; // L: 246 + return true; // L: 247 } - var3.remove(); + var3.remove(); // L: 249 } } else { - this.parameters = new IterableNodeHashTable(4); + this.parameters = new IterableNodeHashTable(4); // L: 252 } - this.parameters.put(new IntegerNode(var2), (long)var1); - return true; + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253 + return true; // L: 254 } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIII)Z", - garbageValue = "-16777216" + descriptor = "(IIIIB)Z", + garbageValue = "32" ) - boolean method2598(int var1, int var2, int var3, int var4) { - 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) { + boolean method2665(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 258 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259 + int var7 = var6 ^ var5; // L: 260 + var2 <<= var3; // L: 261 + var2 &= var7; // L: 262 + if (this.parameters != null) { // L: 263 + Node var8 = this.parameters.get((long)var1); // L: 264 + if (var8 != null) { // L: 265 + if (var8 instanceof IntegerNode) { // L: 266 + IntegerNode var9 = (IntegerNode)var8; // L: 267 + if ((var9.integer & var7) == var2) { // L: 268 return false; } - var9.integer &= ~var7; - var9.integer |= var2; - return true; + var9.integer &= ~var7; // L: 269 + var9.integer |= var2; // L: 270 + return true; // L: 271 } - var8.remove(); + var8.remove(); // L: 273 } } else { - this.parameters = new IterableNodeHashTable(4); + this.parameters = new IterableNodeHashTable(4); // L: 276 } - this.parameters.put(new IntegerNode(var2), (long)var1); - return true; - } - - @ObfuscatedName("x") - boolean method2599(int var1, long var2) { - if (this.parameters != null) { - Node var4 = this.parameters.get((long)var1); - if (var4 != null) { - if (var4 instanceof class367) { - class367 var5 = (class367)var4; - if (var5.field4072 == var2) { - return false; - } - - var5.field4072 = var2; - return true; - } - - var4.remove(); - } - } else { - this.parameters = new IterableNodeHashTable(4); - } - - this.parameters.put(new class367(var2), (long)var1); - return true; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "-1075042811" - ) - boolean method2614(int var1, String var2) { - if (var2 == null) { - var2 = ""; - } else if (var2.length() > 80) { - var2 = var2.substring(0, 80); - } - - 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(); - this.parameters.put(new ObjectNode(var2), var4.key); - return true; - } - } - - var3.remove(); - } - } else { - this.parameters = new IterableNodeHashTable(4); - } - - this.parameters.put(new ObjectNode(var2), (long)var1); - return true; + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277 + return true; // L: 278 } @ObfuscatedName("z") + boolean method2666(int var1, long var2) { + if (this.parameters != null) { // L: 282 + Node var4 = this.parameters.get((long)var1); // L: 283 + if (var4 != null) { // L: 284 + if (var4 instanceof class367) { // L: 285 + class367 var5 = (class367)var4; // L: 286 + if (var2 == var5.field4071) { // L: 287 + return false; + } + + var5.field4071 = var2; // L: 288 + return true; // L: 289 + } + + var4.remove(); // L: 291 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 294 + } + + this.parameters.put(new class367(var2), (long)var1); // L: 295 + return true; // L: 296 + } + + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-2130306293" + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "-203243509" ) - void method2601(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 >= 1 && var2 <= 6) { - int var3 = var1.readUnsignedByte(); - if ((var3 & 1) != 0) { + boolean method2667(int var1, String var2) { + if (var2 == null) { // L: 300 + var2 = ""; + } else if (var2.length() > 80) { // L: 301 + var2 = var2.substring(0, 80); + } + + if (this.parameters != null) { // L: 302 + Node var3 = this.parameters.get((long)var1); // L: 303 + if (var3 != null) { // L: 304 + if (var3 instanceof ObjectNode) { // L: 305 + ObjectNode var4 = (ObjectNode)var3; // L: 306 + if (var4.obj instanceof String) { // L: 307 + if (var2.equals(var4.obj)) { // L: 308 + return false; + } + + var4.remove(); // L: 309 + this.parameters.put(new ObjectNode(var2), var4.key); // L: 310 + return true; // L: 311 + } + } + + var3.remove(); // L: 314 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 317 + } + + this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318 + return true; // L: 319 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "-1240053331" + ) + void method2715(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 323 + if (var2 >= 1 && var2 <= 6) { // L: 324 + int var3 = var1.readUnsignedByte(); // L: 325 + if ((var3 & 1) != 0) { // L: 326 this.useHashes = true; } - if ((var3 & 2) != 0) { + if ((var3 & 2) != 0) { // L: 327 this.useNames = true; } - if (!this.useHashes) { - this.memberHashes = null; - this.bannedMemberHashes = null; + if (!this.useHashes) { // L: 328 + this.memberHashes = null; // L: 329 + this.bannedMemberHashes = null; // L: 330 } - if (!this.useNames) { - this.memberNames = null; - this.bannedMemberNames = null; + if (!this.useNames) { // L: 332 + this.memberNames = null; // L: 333 + this.bannedMemberNames = null; // L: 334 } - this.field1447 = var1.readInt(); - this.field1449 = var1.readInt(); - if (var2 <= 3 && this.field1449 != 0) { - this.field1449 += 16912800; + this.field1465 = var1.readInt(); // L: 336 + this.field1442 = var1.readInt(); // L: 337 + if (var2 <= 3 && this.field1442 != 0) { // L: 338 + this.field1442 += 16912800; } - this.memberCount = var1.readUnsignedShort(); - this.bannedMemberCount = var1.readUnsignedByte(); - this.name = var1.readStringCp1252NullTerminated(); - if (var2 >= 4) { - var1.readInt(); + this.memberCount = var1.readUnsignedShort(); // L: 339 + this.bannedMemberCount = var1.readUnsignedByte(); // L: 340 + this.name = var1.readStringCp1252NullTerminated(); // L: 341 + if (var2 >= 4) { // L: 342 + var1.readInt(); // L: 343 } - this.allowGuests = var1.readUnsignedByte() == 1; - this.field1450 = var1.readByte(); - this.field1452 = var1.readByte(); - this.field1459 = var1.readByte(); - this.field1466 = var1.readByte(); + this.allowGuests = var1.readUnsignedByte() == 1; // L: 345 + this.field1444 = var1.readByte(); // L: 346 + this.field1439 = var1.readByte(); // L: 347 + this.field1446 = var1.readByte(); // L: 348 + this.field1447 = var1.readByte(); // L: 349 int var4; - if (this.memberCount > 0) { - if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { + if (this.memberCount > 0) { // L: 350 + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351 this.memberHashes = new long[this.memberCount]; } - if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { + if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352 this.memberNames = new String[this.memberCount]; } - if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { + if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353 this.memberRanks = new byte[this.memberCount]; } - if (this.field1463 == null || this.field1463.length < this.memberCount) { - this.field1463 = new int[this.memberCount]; + if (this.field1452 == null || this.field1452.length < this.memberCount) { // L: 354 + this.field1452 = new int[this.memberCount]; } - if (this.field1460 == null || this.field1460.length < this.memberCount) { - this.field1460 = new int[this.memberCount]; + if (this.field1453 == null || this.field1453.length < this.memberCount) { // L: 355 + this.field1453 = new int[this.memberCount]; } - if (this.field1461 == null || this.field1461.length < this.memberCount) { - this.field1461 = new boolean[this.memberCount]; + if (this.field1454 == null || this.field1454.length < this.memberCount) { // L: 356 + this.field1454 = new boolean[this.memberCount]; } - for (var4 = 0; var4 < this.memberCount; ++var4) { - if (this.useHashes) { + for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357 + if (this.useHashes) { // L: 358 this.memberHashes[var4] = var1.readLong(); } - if (this.useNames) { + if (this.useNames) { // L: 359 this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.memberRanks[var4] = var1.readByte(); - if (var2 >= 2) { - this.field1463[var4] = var1.readInt(); + this.memberRanks[var4] = var1.readByte(); // L: 360 + if (var2 >= 2) { // L: 361 + this.field1452[var4] = var1.readInt(); } - if (var2 >= 5) { - this.field1460[var4] = var1.readUnsignedShort(); + if (var2 >= 5) { // L: 362 + this.field1453[var4] = var1.readUnsignedShort(); } else { - this.field1460[var4] = 0; + this.field1453[var4] = 0; // L: 363 } - if (var2 >= 6) { - this.field1461[var4] = var1.readUnsignedByte() == 1; + if (var2 >= 6) { // L: 364 + this.field1454[var4] = var1.readUnsignedByte() == 1; } else { - this.field1461[var4] = false; + this.field1454[var4] = false; // L: 365 } } - this.updateOwner(); + this.updateOwner(); // L: 367 } - if (this.bannedMemberCount > 0) { - if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { + if (this.bannedMemberCount > 0) { // L: 369 + if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370 this.bannedMemberHashes = new long[this.bannedMemberCount]; } - if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { + if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371 this.bannedMemberNames = new String[this.bannedMemberCount]; } - for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { - if (this.useHashes) { + for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372 + if (this.useHashes) { // L: 373 this.bannedMemberHashes[var4] = var1.readLong(); } - if (this.useNames) { + if (this.useNames) { // L: 374 this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } } } - if (var2 >= 3) { - var4 = var1.readUnsignedShort(); - if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? InvDefinition.method2881(var4) : 16); + if (var2 >= 3) { // L: 377 + var4 = var1.readUnsignedShort(); // L: 378 + if (var4 > 0) { // L: 379 + int var5; + int var6; + int var7; + if (var4 < 16) { // L: 381 + var7 = var4 - 1; // L: 385 + var7 |= var7 >>> 1; // L: 386 + var7 |= var7 >>> 2; // L: 387 + var7 |= var7 >>> 4; // L: 388 + var7 |= var7 >>> 8; // L: 389 + var7 |= var7 >>> 16; // L: 390 + var6 = var7 + 1; // L: 391 + var5 = var6; // L: 393 + } else { + var5 = 16; // L: 395 + } - 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 class367(var10), (long)var6); - } else if (var7 == 2) { - String var8 = var1.readStringCp1252NullTerminated(); - this.parameters.put(new ObjectNode(var8), (long)var6); + this.parameters = new IterableNodeHashTable(var5); // L: 396 + + while (var4-- > 0) { // L: 397 + var6 = var1.readInt(); // L: 398 + var7 = var6 & 1073741823; // L: 399 + int var8 = var6 >>> 30; // L: 400 + if (var8 == 0) { // L: 401 + int var13 = var1.readInt(); // L: 402 + this.parameters.put(new IntegerNode(var13), (long)var7); // L: 403 + } else if (var8 == 1) { // L: 405 + long var11 = var1.readLong(); // L: 406 + this.parameters.put(new class367(var11), (long)var7); // L: 407 + } else if (var8 == 2) { // L: 409 + String var9 = var1.readStringCp1252NullTerminated(); // L: 410 + this.parameters.put(new ObjectNode(var9), (long)var7); // L: 411 } } } @@ -767,52 +793,74 @@ public class ClanSettings { } else { throw new RuntimeException("" + var2); } - } + } // L: 416 - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lky;IIIBZI)V", - garbageValue = "-1472110152" + descriptor = "(ILmr;Lkd;B)V", + garbageValue = "-44" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; - } + static void method2653(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 + var3.type = 1; // L: 19 + var3.key = (long)var0; // L: 20 + var3.archiveDisk = var1; // L: 21 + var3.archive = var2; // L: 22 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 + } // L: 25 - } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; + Login.method1952(); // L: 26 + } // L: 27 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-80" + ) + public static void method2703(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 66 + } // L: 67 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1184927599" + ) + static void method2714(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 73 75 + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "257088762" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 5089 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 5090 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 5091 + int var3 = var2.x >> 7; // L: 5092 + int var4 = var2.y >> 7; // L: 5093 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 5094 + if (var2.field1087 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 5095 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 5096 + continue; } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 5097 } - var8 = new NetFileRequest(); - var8.archive = var0; - var8.crc = var3; - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - ++NetCache.NetCache_pendingPriorityWritesCount; - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); - NetCache.NetCache_pendingWrites.put(var8, var6); - ++NetCache.NetCache_pendingWritesCount; - } - + long var5 = PacketBuffer.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 5099 + var2.playerCycle = Client.cycle; // L: 5100 + GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, var2.x, var2.y, class392.getTileHeight(var2.field1087 * 64 - 64 + var2.x, var2.field1087 * 64 - 64 + var2.y, GrandExchangeOfferTotalQuantityComparator.Client_plane), var2.field1087 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 5101 } } } - } + + } // L: 5105 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 179306965b..49d981ada0 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -5,7 +5,6 @@ import java.net.Socket; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import net.runelite.mapping.Export; @@ -20,2090 +19,2926 @@ import netscape.javascript.JSObject; public final class Client extends GameEngine implements Usernamed, OAuthTokens { @ObfuscatedName("rv") @ObfuscatedSignature( - descriptor = "[Ldk;" + descriptor = "[Ldm;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("py") + @ObfuscatedName("pu") @ObfuscatedGetter( - intValue = -375150113 - ) - static int field699; - @ObfuscatedName("pn") - @ObfuscatedGetter( - intValue = 658821549 + intValue = 1318637709 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("qh") + @ObfuscatedName("pm") @ObfuscatedGetter( - longValue = 8672650031376335607L + intValue = -538262805 ) - static long field708; - @ObfuscatedName("pd") - static boolean[] field710; - @ObfuscatedName("pl") - static boolean[] field525; - @ObfuscatedName("pi") - static boolean[] field701; - @ObfuscatedName("qz") + static int field678; + @ObfuscatedName("qb") + @ObfuscatedGetter( + longValue = 3974849306413912327L + ) + static long field687; + @ObfuscatedName("rg") + static boolean field710; + @ObfuscatedName("pf") + static boolean[] field594; + @ObfuscatedName("pc") + static boolean[] field651; + @ObfuscatedName("pn") + static boolean[] field553; + @ObfuscatedName("qe") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("ut") + @ObfuscatedName("us") @ObfuscatedGetter( - intValue = 1652688663 + intValue = -1647730605 ) - public static int field763; - @ObfuscatedName("ra") - static boolean field663; - @ObfuscatedName("pk") + public static int field742; + @ObfuscatedName("pi") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("pf") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("pg") + @ObfuscatedName("qa") @Export("rootWidgetWidths") static int[] rootWidgetWidths; + @ObfuscatedName("pa") + @Export("rootWidgetXs") + static int[] rootWidgetXs; @ObfuscatedName("qs") @ObfuscatedGetter( - intValue = -2049999317 + intValue = -1255487241 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("pu") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("up") - @ObfuscatedSignature( - descriptor = "Lbx;" - ) - static final ApproximateRouteStrategy field649; - @ObfuscatedName("qi") + @ObfuscatedName("qq") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("pj") + @ObfuscatedName("ut") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lbs;" + ) + static final ApproximateRouteStrategy field743; + @ObfuscatedName("pt") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("su") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("pq") + @ObfuscatedSignature( + descriptor = "Lkn;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("rk") + @ObfuscatedName("tl") @ObfuscatedSignature( - descriptor = "[Leb;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("uh") - static int[] field668; - @ObfuscatedName("ui") - static int[] field491; - @ObfuscatedName("ru") - @ObfuscatedGetter( - intValue = -637088723 - ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("rg") - @ObfuscatedGetter( - intValue = 2125770367 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("rj") - @ObfuscatedGetter( - intValue = 1753796131 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("ts") - @ObfuscatedGetter( - intValue = -1053103983 - ) - static int field758; - @ObfuscatedName("tt") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("ty") - @ObfuscatedGetter( - intValue = -298323055 - ) - static int field759; - @ObfuscatedName("px") - @ObfuscatedGetter( - intValue = 142845295 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("rn") - @ObfuscatedGetter( - intValue = 1136310005 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("se") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("sw") - static boolean[] field739; - @ObfuscatedName("uf") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("uq") - @ObfuscatedGetter( - intValue = -263735291 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("qq") - @ObfuscatedGetter( - longValue = 8595970348071073099L - ) - static long field719; - @ObfuscatedName("ri") - @ObfuscatedGetter( - intValue = -1871733035 - ) - static int field722; - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = -1582886561 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("to") - @ObfuscatedGetter( - intValue = -409614591 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("qk") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("si") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("tj") - @ObfuscatedGetter( - intValue = -980892169 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("td") - @ObfuscatedGetter( - intValue = -1067117511 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("sy") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("tf") - @ObfuscatedGetter( - intValue = -678405889 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("sr") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("sc") - @ObfuscatedSignature( - descriptor = "[Lau;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("sl") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("sq") - static short field744; - @ObfuscatedName("sb") - static short field747; - @ObfuscatedName("tv") - static short field750; - @ObfuscatedName("qy") - @ObfuscatedGetter( - intValue = -1268631863 - ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("tk") - static short field501; - @ObfuscatedName("tb") - static short field749; - @ObfuscatedName("tn") - @ObfuscatedGetter( - intValue = -717512689 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("ta") - static short field748; - @ObfuscatedName("rc") - @ObfuscatedGetter( - intValue = 1460584323 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("rx") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("tq") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("ry") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("rm") - @ObfuscatedSignature( - descriptor = "[Lon;" - ) - @Export("mapIcons") - static SpritePixels[] mapIcons; - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = -1912998745 - ) - static int field726; - @ObfuscatedName("sv") - static int[] field741; - @ObfuscatedName("sk") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("tw") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("sa") - static int[] field740; - @ObfuscatedName("sx") - static int[] field743; - @ObfuscatedName("sp") - static int[] field742; - @ObfuscatedName("qd") - static int[] field718; - @ObfuscatedName("pp") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static NodeDeque field731; - @ObfuscatedName("qj") - static int[] field532; - @ObfuscatedName("pb") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static NodeDeque field695; - @ObfuscatedName("th") - @ObfuscatedSignature( - descriptor = "[Lkp;" + descriptor = "[Lkh;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("ud") + @ObfuscatedName("ug") + static int[] field538; + @ObfuscatedName("um") + static int[] field748; + @ObfuscatedName("sc") + static boolean[] field718; + @ObfuscatedName("ra") @ObfuscatedGetter( - intValue = 632323647 + intValue = 211285431 ) - static int field521; - @ObfuscatedName("qa") + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("sr") + static int[] field719; + @ObfuscatedName("sq") + static int[] field598; + @ObfuscatedName("so") + static int[] field721; + @ObfuscatedName("sh") + static int[] field722; + @ObfuscatedName("rb") @ObfuscatedGetter( - intValue = 1532586045 + intValue = -595533075 + ) + @Export("destinationX") + static int destinationX; + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = 2048545999 + ) + @Export("destinationY") + static int destinationY; + @ObfuscatedName("tj") + @ObfuscatedGetter( + intValue = 1780596505 + ) + static int field737; + @ObfuscatedName("rr") + @ObfuscatedSignature( + descriptor = "[Lea;" + ) + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; + @ObfuscatedName("pe") + @ObfuscatedGetter( + intValue = 2141771055 + ) + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("ty") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("tt") + @ObfuscatedGetter( + intValue = -1984953373 + ) + static int field581; + @ObfuscatedName("uj") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = 1418203349 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("sf") + @ObfuscatedGetter( + intValue = 1404229279 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("ub") + @ObfuscatedGetter( + intValue = 1629793717 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("se") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("sv") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("sa") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("sj") + @ObfuscatedSignature( + descriptor = "[Lat;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("sy") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("qn") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = -136098309 + ) + static int field701; + @ObfuscatedName("qi") + @ObfuscatedGetter( + intValue = 1315900691 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("qh") + @ObfuscatedGetter( + longValue = 6414008887290405915L + ) + static long field565; + @ObfuscatedName("sw") + static short field464; + @ObfuscatedName("st") + static short field550; + @ObfuscatedName("to") + static short field729; + @ObfuscatedName("th") + static short field730; + @ObfuscatedName("tk") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("ti") + static short field600; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = -1202743261 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("tz") + @ObfuscatedGetter( + intValue = 1171128355 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("tf") + static short field727; + @ObfuscatedName("tp") + @ObfuscatedGetter( + intValue = -1988115801 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("rh") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("rk") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("mapIcons") + static SpritePixels[] mapIcons; + @ObfuscatedName("tg") + @ObfuscatedGetter( + intValue = -943486725 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("ts") + @ObfuscatedGetter( + intValue = 452108079 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("tq") + @ObfuscatedGetter( + intValue = 1749362703 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("tx") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("tn") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("qm") + @ObfuscatedGetter( + intValue = 1275977781 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("qg") - static int[] field554; - @ObfuscatedName("qx") + @ObfuscatedName("uf") @ObfuscatedGetter( - intValue = -1804888553 + intValue = 1680846629 + ) + static int field745; + @ObfuscatedName("qu") + @ObfuscatedGetter( + intValue = -1572669425 + ) + static int field695; + @ObfuscatedName("qo") + @ObfuscatedGetter( + intValue = 1785278473 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("ql") - static String field550; - @ObfuscatedName("tc") + @ObfuscatedName("qy") + static int[] field697; + @ObfuscatedName("pj") @ObfuscatedSignature( - descriptor = "Lbu;" + descriptor = "Lkn;" + ) + static NodeDeque field674; + @ObfuscatedName("qp") + static int[] field696; + @ObfuscatedName("pk") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + static NodeDeque field675; + @ObfuscatedName("qg") + static int[] field689; + @ObfuscatedName("qd") + static String field692; + @ObfuscatedName("ta") + @ObfuscatedSignature( + descriptor = "Lbh;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfy;" + descriptor = "[Lfq;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("g") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("af") - static boolean field684; - @ObfuscatedName("bz") + @ObfuscatedName("ay") + static boolean field497; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 512033263 + intValue = 351012489 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 988736307 + intValue = 2034448565 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -127514409 + intValue = 1913834087 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bx") + @ObfuscatedName("bs") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 979848567 + intValue = -168480125 ) - static int field524; - @ObfuscatedName("bd") + static int field467; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -372020577 + intValue = 1336183037 ) @Export("clientType") static int clientType; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 386953519 + intValue = -1541445221 ) - static int field681; - @ObfuscatedName("bh") + static int field469; + @ObfuscatedName("bz") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - static IndexedSprite field563; @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -446123719 + intValue = 235091161 ) @Export("gameState") static int gameState; - @ObfuscatedName("co") + @ObfuscatedName("cm") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("ck") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1925844067 + intValue = -1803490967 ) @Export("cycle") static int cycle; - @ObfuscatedName("cb") + @ObfuscatedName("cy") @ObfuscatedGetter( - longValue = -3232131472632765751L + longValue = 4321776978045133027L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("db") + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = 811493421 + intValue = -1993769567 ) - static int field495; - @ObfuscatedName("dx") + static int field475; + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -373046411 + intValue = 1440855955 ) - static int field496; - @ObfuscatedName("dd") + static int field476; + @ObfuscatedName("da") @ObfuscatedGetter( - longValue = 4198601607293137673L + longValue = -3998157933727729695L ) - static long field650; - @ObfuscatedName("dp") + static long field477; + @ObfuscatedName("dw") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("dq") + @ObfuscatedName("dn") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("du") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 1713117061 + intValue = 524609557 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -311239939 + intValue = 207642979 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("dy") + @ObfuscatedName("du") @ObfuscatedGetter( - intValue = -687927463 + intValue = 704173975 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("dl") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 738191303 + intValue = -1671516751 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("df") + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -1730965 + intValue = -1956341453 ) @Export("hintArrowX") static int hintArrowX; @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = -184366361 + intValue = 747205027 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("dm") + @ObfuscatedName("dt") @ObfuscatedGetter( - intValue = -1857497037 + intValue = 825806311 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dt") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = -1806632551 + intValue = -1204566063 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dr") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = -1199522407 + intValue = -1072899901 ) @Export("hintArrowSubY") static int hintArrowSubY; @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dv") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lcr;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dw") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 88174603 + intValue = 974303941 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("ds") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 1228529663 + intValue = 1817594467 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("da") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = 434552597 + intValue = 622774087 ) - static int field513; - @ObfuscatedName("ep") + static int field572; + @ObfuscatedName("ee") @ObfuscatedGetter( - intValue = -543080313 + intValue = 1010630599 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("ed") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = 541263159 + intValue = -1726990903 ) @Export("loginState") static int loginState; - @ObfuscatedName("ey") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = -278054881 + intValue = -957566801 ) - static int field516; - @ObfuscatedName("ex") + static int field496; + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -135680147 + intValue = -549727883 ) - static int field680; - @ObfuscatedName("eo") + static int field685; + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = 99674011 + intValue = 921847519 ) - static int field539; - @ObfuscatedName("el") + static int field498; + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldb;" ) - static class112 field519; - @ObfuscatedName("em") + static class112 field693; + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Los;" ) - static class404 field520; - @ObfuscatedName("fy") + static class404 field500; + @ObfuscatedName("fc") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("fw") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "Lby;" + descriptor = "Lbk;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fv") + @ObfuscatedName("fx") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("gd") + @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "[Lcw;" + descriptor = "[Lcp;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("gf") + @ObfuscatedName("gd") @ObfuscatedGetter( - intValue = 1449803711 + intValue = -1362315605 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("gu") + @ObfuscatedName("go") @Export("npcIndices") static int[] npcIndices; @ObfuscatedName("gh") @ObfuscatedGetter( - intValue = -181273181 + intValue = -2135073429 ) - static int field713; + static int field512; + @ObfuscatedName("gn") + static int[] field513; @ObfuscatedName("gb") - static int[] field535; - @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "Lcc;" + descriptor = "Lcv;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("gk") + @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = 1080604705 + intValue = 225699983 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("gw") + @ObfuscatedName("ga") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("ga") + @ObfuscatedName("gs") @Export("useBufferedSocket") static boolean useBufferedSocket; + @ObfuscatedName("gz") + static boolean field619; @ObfuscatedName("gr") - static boolean field540; - @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Llo;" ) @Export("timer") static Timer timer; - @ObfuscatedName("gx") + @ObfuscatedName("ge") @Export("fontsMap") static HashMap fontsMap; + @ObfuscatedName("hm") + @ObfuscatedGetter( + intValue = 2056665983 + ) + static int field521; + @ObfuscatedName("hx") + @ObfuscatedGetter( + intValue = 25303697 + ) + static int field522; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = 363989163 + ) + static int field523; + @ObfuscatedName("hf") + @ObfuscatedGetter( + intValue = -313172501 + ) + static int field524; @ObfuscatedName("hj") @ObfuscatedGetter( - intValue = 429642241 + intValue = 132761911 ) - static int field764; - @ObfuscatedName("hz") - @ObfuscatedGetter( - intValue = -2047349491 - ) - static int field544; - @ObfuscatedName("hd") - @ObfuscatedGetter( - intValue = 7955115 - ) - static int field545; - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = 1758878319 - ) - static int field546; - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = 776809837 - ) - static int field534; + static int field485; @ObfuscatedName("hr") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("hq") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("hp") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("ha") + @ObfuscatedName("hg") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("hm") - static final int[] field690; - @ObfuscatedName("hu") + @ObfuscatedName("hc") + static final int[] field530; + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = 62911743 + intValue = 1163249681 ) - static int field536; - @ObfuscatedName("hv") + static int field531; + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "[Low;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("it") - @Export("selectedItemName") - static String selectedItemName; - @ObfuscatedName("iy") + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("ik") @ObfuscatedGetter( - intValue = 918156389 + intValue = -2143676759 ) - static int field553; - @ObfuscatedName("id") + static int field628; + @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = 1728658311 + intValue = 170443145 ) - static int field514; - @ObfuscatedName("is") + static int field534; + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = -1457029895 + intValue = -125520475 ) - static int field555; - @ObfuscatedName("in") + static int field535; + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 839369183 + intValue = 1324928345 ) - static int field697; - @ObfuscatedName("ip") - static boolean field551; - @ObfuscatedName("iu") + static int field506; + @ObfuscatedName("im") + static boolean field465; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = -669095929 + intValue = 1325089479 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("im") + @ObfuscatedName("iu") @ObfuscatedGetter( - intValue = 1491632285 + intValue = -613321371 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("ib") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = 365891595 + intValue = -999156139 ) @Export("camAngleY") static int camAngleY; @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = 903011995 + intValue = -567570165 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("iv") + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -242387739 + intValue = 503166845 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("ic") + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = 1304297933 + intValue = 1038338863 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("ia") + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = -517728459 + intValue = 851159249 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("ie") + @ObfuscatedName("it") + @Export("selectedItemName") + static String selectedItemName; + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = -1645388963 + intValue = 682763337 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("je") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 650404899 + intValue = -953648473 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("jo") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = -1300279595 + intValue = -1959842021 ) - static int field567; - @ObfuscatedName("jr") + static int field547; + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -1313239981 + intValue = -612526431 ) - static int field727; - @ObfuscatedName("jk") + static int field520; + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = -1802973869 + intValue = 1932679935 ) - static int field661; - @ObfuscatedName("ja") + static int field549; + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -1229982081 + intValue = -567507933 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("jp") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = 1796605093 + intValue = 2001475371 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("jl") + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -1959883561 + intValue = -2052313535 ) - static int field572; - @ObfuscatedName("jb") - static boolean field573; - @ObfuscatedName("jq") + static int field552; + @ObfuscatedName("js") + static boolean field511; + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = -1418768187 + intValue = -1449900521 ) - static int field574; + static int field620; @ObfuscatedName("jg") - static boolean field575; - @ObfuscatedName("ju") + static boolean field555; + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = -616234769 + intValue = 1902791501 ) - static int field565; - @ObfuscatedName("jv") + static int field556; + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = -1042076149 + intValue = -384375877 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("jh") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = 1840257993 + intValue = -367077625 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("ji") + @ObfuscatedName("jd") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("jz") + @ObfuscatedName("jo") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("jw") + @ObfuscatedName("jq") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("jj") + @ObfuscatedName("ja") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("js") + @ObfuscatedName("jr") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jy") + @ObfuscatedName("ju") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jm") + @ObfuscatedName("jb") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jd") + @ObfuscatedName("jc") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jx") + @ObfuscatedName("kg") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ks") + @ObfuscatedName("kd") @ObfuscatedGetter( - intValue = 1896228975 + intValue = -538809643 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("ky") + @ObfuscatedName("kj") @ObfuscatedGetter( - intValue = -2020922955 + intValue = 1177959045 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("kr") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = 1448085957 + intValue = -1589309887 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("kl") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = -1456477803 + intValue = -1580074049 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("kb") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -1624201253 + intValue = -1310849273 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("kg") + @ObfuscatedName("ki") @ObfuscatedGetter( - intValue = 2032961995 + intValue = 1284537869 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("kk") + @ObfuscatedName("km") @ObfuscatedGetter( - intValue = 1021032213 + intValue = -776648095 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("kq") + @ObfuscatedName("kr") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("ki") + @ObfuscatedName("ku") @ObfuscatedGetter( - intValue = -1860756085 + intValue = -1997052949 ) - static int field620; - @ObfuscatedName("kx") + static int field576; + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = -870124891 + intValue = -1194890067 ) - static int field597; - @ObfuscatedName("kc") + static int field577; + @ObfuscatedName("kv") @ObfuscatedGetter( - intValue = -1873119605 + intValue = -1781843123 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("kj") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = -1697444733 + intValue = 1331142965 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("kh") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = 804166773 + intValue = -115957737 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("ku") + @ObfuscatedName("ke") @ObfuscatedGetter( - intValue = -1951958309 + intValue = 445396889 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("kv") - static boolean field602; - @ObfuscatedName("kn") + @ObfuscatedName("kz") + static boolean field667; + @ObfuscatedName("ks") @ObfuscatedGetter( - intValue = 1412990731 + intValue = 2009355879 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("kw") + @ObfuscatedName("kc") @ObfuscatedGetter( - intValue = -605440881 + intValue = -839662267 ) - static int field559; - @ObfuscatedName("kz") + static int field539; + @ObfuscatedName("kn") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ka") + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "[Lci;" + descriptor = "[Lcx;" ) @Export("players") static Player[] players; - @ObfuscatedName("km") + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = -356697653 + intValue = -296903929 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("le") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = 556755365 + intValue = 1537694345 ) - static int field630; - @ObfuscatedName("lt") + static int field588; + @ObfuscatedName("ls") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("ls") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 662672375 + intValue = 484882315 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("lx") - @ObfuscatedGetter( - intValue = 963863569 - ) - static int field611; - @ObfuscatedName("lv") - static int[] field612; - @ObfuscatedName("lr") - @Export("playerMenuOpcodes") - static final int[] playerMenuOpcodes; - @ObfuscatedName("lw") - @Export("playerMenuActions") - static String[] playerMenuActions; - @ObfuscatedName("lb") - @Export("playerOptionsPriorities") - static boolean[] playerOptionsPriorities; - @ObfuscatedName("lo") - @Export("defaultRotations") - static int[] defaultRotations; @ObfuscatedName("li") @ObfuscatedGetter( - intValue = 26459347 + intValue = 1643293445 + ) + static int field591; + @ObfuscatedName("lx") + static int[] field592; + @ObfuscatedName("ln") + @Export("playerMenuOpcodes") + static final int[] playerMenuOpcodes; + @ObfuscatedName("lo") + @Export("playerMenuActions") + static String[] playerMenuActions; + @ObfuscatedName("lu") + @Export("playerOptionsPriorities") + static boolean[] playerOptionsPriorities; + @ObfuscatedName("lh") + @Export("defaultRotations") + static int[] defaultRotations; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = 398938707 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("lf") + @ObfuscatedName("lj") @ObfuscatedSignature( - descriptor = "[[[Lkf;" + descriptor = "[[[Lkn;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("lk") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("ln") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("ld") + @ObfuscatedName("lg") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("lp") + @ObfuscatedName("lz") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("lz") + @ObfuscatedName("lv") @Export("levels") static int[] levels; - @ObfuscatedName("lg") + @ObfuscatedName("lw") @Export("experience") static int[] experience; - @ObfuscatedName("lm") + @ObfuscatedName("lp") @ObfuscatedGetter( - intValue = -656086715 + intValue = -195460363 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("lj") + @ObfuscatedName("la") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("mc") + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = -1352565651 + intValue = -2068095649 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("mk") + @ObfuscatedName("mw") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("mn") + @ObfuscatedName("me") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("mf") + @ObfuscatedName("mb") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("mz") + @ObfuscatedName("mr") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("mm") + @ObfuscatedName("mq") @Export("menuActions") static String[] menuActions; @ObfuscatedName("ms") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("mr") + @ObfuscatedName("mo") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("me") + @ObfuscatedName("mc") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; @ObfuscatedName("md") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("mt") + @ObfuscatedName("ml") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("mu") + @ObfuscatedName("mf") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("mh") + @ObfuscatedName("mn") @ObfuscatedGetter( - intValue = -424522549 + intValue = -96034183 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("mp") + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = -106836395 + intValue = 501918403 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("ml") + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = -891724889 + intValue = 1898641855 ) - static int field557; - @ObfuscatedName("mb") + static int field621; + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -2060316951 + intValue = 786548003 ) - static int field642; - @ObfuscatedName("mx") + static int field714; + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -1211673873 + intValue = -1422128073 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("nu") + @ObfuscatedName("nh") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("np") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = 1960701091 + intValue = 124054907 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("ng") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = -882140087 + intValue = 1744337675 ) - static int field647; - @ObfuscatedName("nv") + static int field627; + @ObfuscatedName("nj") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("nm") + @ObfuscatedName("np") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("nr") + @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = 38935301 + intValue = 562838955 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("nk") + @ObfuscatedName("nc") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = -508691007 + intValue = -1369344199 ) - static int field509; + static int field479; + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = 467301507 + ) + static int field633; @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = 790876457 - ) - static int field673; - @ObfuscatedName("ni") - @ObfuscatedGetter( - intValue = -1532573151 + intValue = -1388268323 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("nw") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 337838357 + intValue = -1981485819 ) - static int field655; - @ObfuscatedName("nt") + static int field656; + @ObfuscatedName("ni") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("ny") + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = -883247427 + intValue = -1598051109 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("ns") + @ObfuscatedName("nv") @ObfuscatedGetter( - intValue = 788246481 + intValue = 878706649 ) @Export("weight") static int weight; - @ObfuscatedName("nj") + @ObfuscatedName("nw") @ObfuscatedGetter( - intValue = 1942504279 + intValue = -755396483 ) @Export("staffModLevel") public static int staffModLevel; - @ObfuscatedName("nq") + @ObfuscatedName("nk") @ObfuscatedGetter( - intValue = -1722694677 + intValue = 1189338431 ) @Export("followerIndex") static int followerIndex; @ObfuscatedName("no") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("nc") + @ObfuscatedName("nd") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("nb") + @ObfuscatedName("ne") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ne") + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("ow") + @ObfuscatedName("ot") @ObfuscatedGetter( - intValue = -2051161493 + intValue = 641959691 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("oi") + @ObfuscatedName("og") @ObfuscatedGetter( - intValue = -799572455 + intValue = 902517461 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("od") + @ObfuscatedName("on") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("os") - static boolean field595; - @ObfuscatedName("of") + @ObfuscatedName("oo") + static boolean field648; + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = 1828492715 + intValue = 1606030359 ) - static int field669; - @ObfuscatedName("op") - @ObfuscatedGetter( - intValue = -382731895 - ) - static int field670; - @ObfuscatedName("oc") - static boolean field671; + static int field649; @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = -1406735933 + intValue = 1355964353 ) - static int field672; - @ObfuscatedName("ou") + static int field650; + @ObfuscatedName("oi") + static boolean field680; + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = -1787006661 + intValue = -30477907 ) - static int field608; - @ObfuscatedName("oy") + static int field652; + @ObfuscatedName("oj") + @ObfuscatedGetter( + intValue = -1581362061 + ) + static int field468; + @ObfuscatedName("op") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("om") + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -1259941325 + intValue = 105350317 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("oa") + @ObfuscatedName("ov") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("oj") + @ObfuscatedName("ob") @ObfuscatedGetter( - intValue = 1032665603 + intValue = -346434099 ) @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("oo") + @ObfuscatedName("od") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("ov") + @ObfuscatedName("om") @ObfuscatedGetter( - intValue = -1437858425 + intValue = -1624807725 ) - static int field679; - @ObfuscatedName("ob") + static int field659; + @ObfuscatedName("oe") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("oz") + @ObfuscatedName("ow") @ObfuscatedGetter( - intValue = 2041153631 + intValue = 936825 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("on") - static int[] field682; - @ObfuscatedName("ol") + @ObfuscatedName("ou") + static int[] field662; + @ObfuscatedName("oc") @ObfuscatedGetter( - intValue = -187547255 + intValue = 101503795 ) - static int field683; - @ObfuscatedName("og") + static int field663; + @ObfuscatedName("pw") @ObfuscatedGetter( - intValue = -660834771 + intValue = 550781787 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pv") - @ObfuscatedGetter( - intValue = 355698679 - ) - static int field685; - @ObfuscatedName("pa") - @ObfuscatedGetter( - intValue = -22605919 - ) - static int field686; - @ObfuscatedName("pt") - @ObfuscatedGetter( - intValue = -997249107 - ) - static int field687; @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = 1875355069 + intValue = 651234723 ) - static int field594; - @ObfuscatedName("pc") + static int field679; + @ObfuscatedName("pd") @ObfuscatedGetter( - intValue = -907092363 + intValue = -1548223605 ) - static int field577; - @ObfuscatedName("pm") + static int field666; + @ObfuscatedName("pp") @ObfuscatedGetter( - intValue = 1660311595 + intValue = -1373827689 ) - static int field489; - @ObfuscatedName("pw") + static int field681; + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = 674723093 + intValue = 2096555667 ) - static int field691; - @ObfuscatedName("ff") - String field547; - @ObfuscatedName("fd") + static int field724; + @ObfuscatedName("pb") + @ObfuscatedGetter( + intValue = -1852458019 + ) + static int field536; + @ObfuscatedName("py") + @ObfuscatedGetter( + intValue = -789131501 + ) + static int field670; + @ObfuscatedName("px") + @ObfuscatedGetter( + intValue = 863379247 + ) + static int field494; + @ObfuscatedName("ft") + String field501; + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Ls;" + descriptor = "Ll;" ) - class14 field522; - @ObfuscatedName("fn") + class14 field491; + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Ld;" ) - class19 field523; - @ObfuscatedName("fu") + class19 field537; + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lop;" ) - Buffer field527; - @ObfuscatedName("fc") + Buffer field579; + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "La;" + descriptor = "Lp;" ) - class7 field528; + class7 field507; static { - field684 = true; - worldId = 1; - worldProperties = 0; - gameBuild = 0; - isMembersWorld = false; - isLowDetail = false; - field524 = -1; - clientType = -1; - field681 = -1; - onMobile = false; - gameState = 0; - isLoading = true; - cycle = 0; - mouseLastLastPressedTimeMillis = -1L; - field495 = -1; - field496 = -1; - field650 = -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; - field513 = 0; - js5Errors = 0; - loginState = 0; - field516 = 0; - field680 = 0; - field539 = 0; - field519 = class112.field1359; - field520 = class404.field4344; - Login_isUsernameRemembered = false; - secureRandomFuture = new SecureRandomFuture(); - randomDatData = null; - npcs = new NPC[32768]; - npcCount = 0; - npcIndices = new int[32768]; - field713 = 0; - field535 = new int[250]; - packetWriter = new PacketWriter(); - logoutTimer = 0; - hadNetworkError = false; - useBufferedSocket = true; - field540 = false; - timer = new Timer(); - fontsMap = new HashMap(); - field764 = 0; - field544 = 1; - field545 = 0; - field546 = 1; - field534 = 0; - collisionMaps = new CollisionMap[4]; - isInInstance = false; - instanceChunkTemplates = new int[4][13][13]; - field690 = 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}; - field536 = 0; - field553 = 2301979; - field514 = 5063219; - field555 = 3353893; - field697 = 7759444; - field551 = false; - alternativeScrollbarWidth = 0; - camAngleX = 128; - camAngleY = 0; - camAngleDY = 0; - camAngleDX = 0; - mouseCamClickedX = 0; - mouseCamClickedY = 0; - oculusOrbState = 0; - camFollowHeight = 50; - field567 = 0; - field727 = 0; - field661 = 0; - oculusOrbNormalSpeed = 12; - oculusOrbSlowedSpeed = 6; - field572 = 0; - field573 = false; - field574 = 0; - field575 = false; - field565 = 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; - field620 = 0; - field597 = 0; - dragItemSlotSource = 0; - draggedWidgetX = 0; - draggedWidgetY = 0; - dragItemSlotDestination = 0; - field602 = false; - itemDragDuration = 0; - field559 = 0; - showLoadingMessages = true; - players = new Player[2048]; - localPlayerIndex = -1; - field630 = 0; - renderSelf = true; - drawPlayerNames = 0; - field611 = 0; - field612 = 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; - field557 = 0; - field642 = 50; - isItemSelected = 0; - selectedItemName = null; - isSpellSelected = false; - selectedSpellChildIndex = -1; - field647 = -1; - selectedSpellActionName = null; - selectedSpellName = null; - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - field509 = 0; - field673 = -1; - chatEffects = 0; - field655 = 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; - field595 = false; - field669 = -1; - field670 = -1; - field671 = false; - field672 = -1; - field608 = -1; - isDraggingWidget = false; - cycleCntr = 1; - changedVarps = new int[32]; - changedVarpCount = 0; - changedItemContainers = new int[32]; - field679 = 0; - changedSkills = new int[32]; - changedSkillsCount = 0; - field682 = new int[32]; - field683 = 0; - chatCycle = 0; - field685 = 0; - field686 = 0; - field687 = 0; - field594 = 0; - field577 = 0; - field489 = 0; - field691 = 0; - mouseWheelRotation = 0; - scriptEvents = new NodeDeque(); - field731 = new NodeDeque(); - field695 = new NodeDeque(); - widgetFlags = new NodeHashTable(512); - rootWidgetCount = 0; - field699 = -2; - field710 = new boolean[100]; - field701 = new boolean[100]; - field525 = new boolean[100]; - rootWidgetXs = new int[100]; - rootWidgetYs = new int[100]; - rootWidgetWidths = new int[100]; - rootWidgetHeights = new int[100]; - gameDrawingMode = 0; - field708 = 0L; - isResizable = true; - field554 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; - publicChatMode = 0; - tradeChatMode = 0; - field550 = ""; - crossWorldMessageIds = new long[100]; - crossWorldMessageIdsIndex = 0; - field726 = 0; - field532 = new int[128]; - field718 = new int[128]; - field719 = -1L; - currentClanSettings = new ClanSettings[2]; - currentClanChannels = new ClanChannel[2]; - field722 = -1; - mapIconCount = 0; - mapIconXs = new int[1000]; - mapIconYs = new int[1000]; - mapIcons = new SpritePixels[1000]; - destinationX = 0; - destinationY = 0; - minimapState = 0; - currentTrackGroupId = -1; - field663 = 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; - field739 = new boolean[5]; - field740 = new int[5]; - field741 = new int[5]; - field742 = new int[5]; - field743 = new int[5]; - field744 = 256; - field747 = 205; - zoomHeight = 256; - zoomWidth = 320; - field748 = 1; - field749 = 32767; - field750 = 1; - field501 = 32767; - viewportOffsetX = 0; - viewportOffsetY = 0; - viewportWidth = 0; - viewportHeight = 0; - viewportZoom = 0; - playerAppearance = new PlayerComposition(); - field758 = -1; - field759 = -1; - platformInfoProvider = new DesktopPlatformInfoProvider(); - grandExchangeOffers = new GrandExchangeOffer[8]; - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field763 = -1; - archiveLoaders = new ArrayList(10); - archiveLoadersDone = 0; - field521 = 0; - field649 = new ApproximateRouteStrategy(); - field668 = new int[50]; - field491 = new int[50]; + field497 = true; // L: 133 + worldId = 1; // L: 134 + worldProperties = 0; // L: 135 + gameBuild = 0; // L: 137 + isMembersWorld = false; // L: 140 + isLowDetail = false; // L: 141 + field467 = -1; // L: 146 + clientType = -1; // L: 147 + field469 = -1; // L: 148 + onMobile = false; // L: 149 + gameState = 0; // L: 160 + isLoading = true; // L: 182 + cycle = 0; // L: 183 + mouseLastLastPressedTimeMillis = -1L; // L: 184 + field475 = -1; // L: 186 + field476 = -1; // L: 187 + field477 = -1L; // L: 188 + hadFocus = true; // L: 189 + displayFps = false; // L: 190 + rebootTimer = 0; // L: 191 + hintArrowType = 0; // L: 192 + hintArrowNpcIndex = 0; // L: 193 + hintArrowPlayerIndex = 0; // L: 194 + hintArrowX = 0; // L: 195 + hintArrowY = 0; // L: 196 + hintArrowHeight = 0; // L: 197 + hintArrowSubX = 0; // L: 198 + hintArrowSubY = 0; // L: 199 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 201 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 202 + titleLoadingStage = 0; // L: 205 + js5ConnectState = 0; // L: 208 + field572 = 0; // L: 209 + js5Errors = 0; // L: 231 + loginState = 0; // L: 233 + field496 = 0; // L: 234 + field685 = 0; // L: 235 + field498 = 0; // L: 236 + field693 = class112.field1346; // L: 237 + field500 = class404.field4351; // L: 238 + Login_isUsernameRemembered = false; // L: 255 + secureRandomFuture = new SecureRandomFuture(); // L: 256 + randomDatData = null; // L: 261 + npcs = new NPC[32768]; // L: 265 + npcCount = 0; // L: 266 + npcIndices = new int[32768]; // L: 267 + field512 = 0; // L: 268 + field513 = new int[250]; // L: 269 + packetWriter = new PacketWriter(); // L: 272 + logoutTimer = 0; // L: 274 + hadNetworkError = false; // L: 275 + useBufferedSocket = true; // L: 276 + field619 = false; // L: 277 + timer = new Timer(); // L: 278 + fontsMap = new HashMap(); // L: 284 + field521 = 0; // L: 291 + field522 = 1; // L: 292 + field523 = 0; // L: 293 + field524 = 1; // L: 294 + field485 = 0; // L: 295 + collisionMaps = new CollisionMap[4]; // L: 303 + isInInstance = false; // L: 304 + instanceChunkTemplates = new int[4][13][13]; // L: 305 + field530 = 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: 306 + field531 = 0; // L: 309 + field628 = 2301979; // L: 321 + field534 = 5063219; // L: 322 + field535 = 3353893; // L: 323 + field506 = 7759444; // L: 324 + field465 = false; // L: 325 + alternativeScrollbarWidth = 0; // L: 326 + camAngleX = 128; // L: 334 + camAngleY = 0; // L: 335 + camAngleDY = 0; // L: 336 + camAngleDX = 0; // L: 337 + mouseCamClickedX = 0; // L: 338 + mouseCamClickedY = 0; // L: 339 + oculusOrbState = 0; // L: 340 + camFollowHeight = 50; // L: 341 + field547 = 0; // L: 345 + field520 = 0; // L: 346 + field549 = 0; // L: 347 + oculusOrbNormalSpeed = 12; // L: 349 + oculusOrbSlowedSpeed = 6; // L: 350 + field552 = 0; // L: 351 + field511 = false; // L: 352 + field620 = 0; // L: 353 + field555 = false; // L: 354 + field556 = 0; // L: 355 + overheadTextCount = 0; // L: 356 + overheadTextLimit = 50; // L: 357 + overheadTextXs = new int[overheadTextLimit]; // L: 358 + overheadTextYs = new int[overheadTextLimit]; // L: 359 + overheadTextAscents = new int[overheadTextLimit]; // L: 360 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 361 + overheadTextColors = new int[overheadTextLimit]; // L: 362 + overheadTextEffects = new int[overheadTextLimit]; // L: 363 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 364 + overheadText = new String[overheadTextLimit]; // L: 365 + tileLastDrawnActor = new int[104][104]; // L: 366 + viewportDrawCount = 0; // L: 367 + viewportTempX = -1; // L: 368 + viewportTempY = -1; // L: 369 + mouseCrossX = 0; // L: 370 + mouseCrossY = 0; // L: 371 + mouseCrossState = 0; // L: 372 + mouseCrossColor = 0; // L: 373 + showMouseCross = true; // L: 374 + field576 = 0; // L: 376 + field577 = 0; // L: 377 + dragItemSlotSource = 0; // L: 380 + draggedWidgetX = 0; // L: 381 + draggedWidgetY = 0; // L: 382 + dragItemSlotDestination = 0; // L: 383 + field667 = false; // L: 384 + itemDragDuration = 0; // L: 385 + field539 = 0; // L: 386 + showLoadingMessages = true; // L: 388 + players = new Player[2048]; // L: 390 + localPlayerIndex = -1; // L: 392 + field588 = 0; // L: 393 + renderSelf = true; // L: 395 + drawPlayerNames = 0; // L: 400 + field591 = 0; // L: 401 + field592 = new int[1000]; // L: 402 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 404 + playerMenuActions = new String[8]; // L: 405 + playerOptionsPriorities = new boolean[8]; // L: 406 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 407 + combatTargetPlayerIndex = -1; // L: 408 + groundItems = new NodeDeque[4][104][104]; // L: 409 + pendingSpawns = new NodeDeque(); // L: 410 + projectiles = new NodeDeque(); // L: 411 + graphicsObjects = new NodeDeque(); // L: 412 + currentLevels = new int[25]; // L: 413 + levels = new int[25]; // L: 414 + experience = new int[25]; // L: 415 + leftClickOpensMenu = 0; // L: 416 + isMenuOpen = false; // L: 417 + menuOptionsCount = 0; // L: 423 + menuArguments1 = new int[500]; // L: 424 + menuArguments2 = new int[500]; // L: 425 + menuOpcodes = new int[500]; // L: 426 + menuIdentifiers = new int[500]; // L: 427 + menuActions = new String[500]; // L: 428 + menuTargets = new String[500]; // L: 429 + menuShiftClick = new boolean[500]; // L: 430 + followerOpsLowPriority = false; // L: 431 + shiftClickDrop = false; // L: 433 + tapToDrop = false; // L: 434 + showMouseOverText = true; // L: 435 + viewportX = -1; // L: 436 + viewportY = -1; // L: 437 + field621 = 0; // L: 441 + field714 = 50; // L: 442 + isItemSelected = 0; // L: 443 + selectedItemName = null; // L: 447 + isSpellSelected = false; // L: 448 + selectedSpellChildIndex = -1; // L: 450 + field627 = -1; // L: 451 + selectedSpellActionName = null; // L: 453 + selectedSpellName = null; // L: 454 + rootInterface = -1; // L: 455 + interfaceParents = new NodeHashTable(8); // L: 456 + field479 = 0; // L: 461 + field633 = -1; // L: 462 + chatEffects = 0; // L: 463 + field656 = 0; // L: 464 + meslayerContinueWidget = null; // L: 465 + runEnergy = 0; // L: 466 + weight = 0; // L: 467 + staffModLevel = 0; // L: 468 + followerIndex = -1; // L: 469 + playerMod = false; // L: 470 + viewportWidget = null; // L: 471 + clickedWidget = null; // L: 472 + clickedWidgetParent = null; // L: 473 + widgetClickX = 0; // L: 474 + widgetClickY = 0; // L: 475 + draggedOnWidget = null; // L: 476 + field648 = false; // L: 477 + field649 = -1; // L: 478 + field650 = -1; // L: 479 + field680 = false; // L: 480 + field652 = -1; // L: 481 + field468 = -1; // L: 482 + isDraggingWidget = false; // L: 483 + cycleCntr = 1; // L: 488 + changedVarps = new int[32]; // L: 491 + changedVarpCount = 0; // L: 492 + changedItemContainers = new int[32]; // L: 493 + field659 = 0; // L: 494 + changedSkills = new int[32]; // L: 495 + changedSkillsCount = 0; // L: 496 + field662 = new int[32]; // L: 497 + field663 = 0; // L: 498 + chatCycle = 0; // L: 499 + field679 = 0; // L: 500 + field666 = 0; // L: 501 + field681 = 0; // L: 502 + field724 = 0; // L: 503 + field536 = 0; // L: 504 + field670 = 0; // L: 505 + field494 = 0; // L: 506 + mouseWheelRotation = 0; // L: 512 + scriptEvents = new NodeDeque(); // L: 513 + field674 = new NodeDeque(); // L: 514 + field675 = new NodeDeque(); // L: 515 + widgetFlags = new NodeHashTable(512); // L: 516 + rootWidgetCount = 0; // L: 518 + field678 = -2; // L: 519 + field594 = new boolean[100]; // L: 520 + field553 = new boolean[100]; // L: 521 + field651 = new boolean[100]; // L: 522 + rootWidgetXs = new int[100]; // L: 523 + rootWidgetYs = new int[100]; // L: 524 + rootWidgetWidths = new int[100]; // L: 525 + rootWidgetHeights = new int[100]; // L: 526 + gameDrawingMode = 0; // L: 527 + field687 = 0L; // L: 528 + isResizable = true; // L: 529 + field689 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 536 + publicChatMode = 0; // L: 537 + tradeChatMode = 0; // L: 539 + field692 = ""; // L: 540 + crossWorldMessageIds = new long[100]; // L: 542 + crossWorldMessageIdsIndex = 0; // L: 543 + field695 = 0; // L: 545 + field696 = new int[128]; // L: 546 + field697 = new int[128]; // L: 547 + field565 = -1L; // L: 548 + currentClanSettings = new ClanSettings[2]; // L: 552 + currentClanChannels = new ClanChannel[2]; // L: 554 + field701 = -1; // L: 556 + mapIconCount = 0; // L: 557 + mapIconXs = new int[1000]; // L: 558 + mapIconYs = new int[1000]; // L: 559 + mapIcons = new SpritePixels[1000]; // L: 560 + destinationX = 0; // L: 561 + destinationY = 0; // L: 562 + minimapState = 0; // L: 569 + currentTrackGroupId = -1; // L: 570 + field710 = false; // L: 571 + soundEffectCount = 0; // L: 577 + soundEffectIds = new int[50]; // L: 578 + queuedSoundEffectLoops = new int[50]; // L: 579 + queuedSoundEffectDelays = new int[50]; // L: 580 + soundLocations = new int[50]; // L: 581 + soundEffects = new SoundEffect[50]; // L: 582 + isCameraLocked = false; // L: 584 + field718 = new boolean[5]; // L: 596 + field719 = new int[5]; // L: 597 + field598 = new int[5]; // L: 598 + field721 = new int[5]; // L: 599 + field722 = new int[5]; // L: 600 + field464 = 256; // L: 601 + field550 = 205; // L: 602 + zoomHeight = 256; // L: 603 + zoomWidth = 320; // L: 604 + field727 = 1; // L: 605 + field600 = 32767; // L: 606 + field729 = 1; // L: 607 + field730 = 32767; // L: 608 + viewportOffsetX = 0; // L: 609 + viewportOffsetY = 0; // L: 610 + viewportWidth = 0; // L: 611 + viewportHeight = 0; // L: 612 + viewportZoom = 0; // L: 613 + playerAppearance = new PlayerComposition(); // L: 615 + field737 = -1; // L: 616 + field581 = -1; // L: 617 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 619 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 621 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 624 + field742 = -1; // L: 631 + archiveLoaders = new ArrayList(10); // L: 632 + archiveLoadersDone = 0; // L: 633 + field745 = 0; // L: 634 + field743 = new ApproximateRouteStrategy(); // L: 643 + field538 = new int[50]; // L: 644 + field748 = new int[50]; // L: 645 } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1526531599" + garbageValue = "1701018417" ) @Export("resizeGame") protected final void resizeGame() { - field708 = UserComparator4.method2406() + 500L; - this.resizeJS(); - if (rootInterface != -1) { + field687 = class111.method2516() + 500L; // L: 4578 + this.resizeJS(); // L: 4579 + if (rootInterface != -1) { // L: 4580 this.resizeRoot(true); } - } + } // L: 4581 - @ObfuscatedName("d") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "940201361" + garbageValue = "-2071280922" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; - int[] var2 = new int[]{1000, 100, 500}; - if (var1 != null && var2 != null) { - GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes = var1; - Message.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - class117.ByteArrayPool_arrays = new byte[var1.length][][]; + ItemComposition.method3408(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 794 + ApproximateRouteStrategy.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 795 + ParamComposition.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 796 + ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 797 + DesktopPlatformInfoProvider.field4081 = class260.field3035; // L: 798 + class137.field1519 = class260.field3039; // L: 799 + Varps.field3013 = class260.field3036; // L: 800 + ClanChannel.field1512 = class260.field3037; // L: 801 + class320.urlRequester = new UrlRequester(); // L: 802 + this.setUpKeyboard(); // L: 803 + this.method440(); // L: 804 + MouseHandler.mouseWheel = this.mouseWheel(); // L: 805 + WorldMapArea.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 806 + AccessFile var2 = null; // L: 809 + ClientPreferences var3 = new ClientPreferences(); // L: 810 - for (int var3 = 0; var3 < GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes.length; ++var3) { - class117.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; - ByteArrayPool.field3893.add(var1[var3]); + try { + var2 = DevicePcmPlayerProvider.getPreferencesFile("", RouteStrategy.field1986.name, false); // L: 812 + byte[] var4 = new byte[(int)var2.length()]; // L: 813 + + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 814 815 818 + var6 = var2.read(var4, var5, var4.length - var5); // L: 816 + if (var6 == -1) { // L: 817 + throw new IOException(); + } } - Collections.sort(ByteArrayPool.field3893); - } else { - GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes = null; - Message.ByteArrayPool_altSizeArrayCounts = null; - class117.ByteArrayPool_arrays = null; - ByteArrayPool.field3893.clear(); - ByteArrayPool.field3893.add(100); - ByteArrayPool.field3893.add(5000); - ByteArrayPool.field3893.add(10000); - ByteArrayPool.field3893.add(30000); + var3 = new ClientPreferences(new Buffer(var4)); // L: 820 + } catch (Exception var8) { // L: 822 } - WorldMapLabelSize.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - UserList.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - RouteStrategy.currentPort = WorldMapLabelSize.worldPort; - PlayerComposition.field3023 = class260.field3034; - class185.field2101 = class260.field3030; - SceneTilePaint.field2600 = class260.field3033; - WorldMapLabel.field2180 = class260.field3031; - WorldMapSection0.urlRequester = new UrlRequester(); - this.setUpKeyboard(); - this.method452(); - AccessFile.mouseWheel = this.mouseWheel(); - HealthBarUpdate.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - WorldMapDecorationType.clientPreferences = class67.method1887(); - this.setUpClipboard(); - GZipDecompressor.method7450(this, UrlRequester.field1303); - if (gameBuild != 0) { + try { + if (var2 != null) { // L: 824 + var2.close(); + } + } catch (Exception var7) { // L: 826 + } + + class408.clientPreferences = var3; // L: 829 + this.setUpClipboard(); // L: 830 + GrandExchangeOfferWorldComparator.method5440(this, VarcInt.field1645); // L: 831 + if (gameBuild != 0) { // L: 832 displayFps = true; } - class392.setWindowedMode(WorldMapDecorationType.clientPreferences.windowMode); - Message.friendSystem = new FriendSystem(WorldMapSectionType.loginType); - this.field522 = new class14("tokenRequest", 1, 1); - } + HorizontalAlignment.setWindowedMode(class408.clientPreferences.windowMode); // L: 833 + class112.friendSystem = new FriendSystem(GrandExchangeOfferUnitPriceComparator.loginType); // L: 834 + this.field491 = new class14("tokenRequest", 1, 1); // L: 835 + } // L: 836 - @ObfuscatedName("ab") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1675225894" + garbageValue = "466223513" ) @Export("doCycle") protected final void doCycle() { - ++cycle; - this.doCycleJs5(); - - while (true) { - ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var1 == null) { - int var5; - try { - if (class247.musicPlayerStatus == 1) { - var5 = class247.midiPcmStream.method4705(); - if (var5 > 0 && class247.midiPcmStream.isReady()) { - var5 -= class247.pcmSampleLength; - if (var5 < 0) { - var5 = 0; - } - - class247.midiPcmStream.setPcmStreamVolume(var5); - } else { - class247.midiPcmStream.clear(); - class247.midiPcmStream.removeAll(); - if (class113.musicTrackArchive != null) { - class247.musicPlayerStatus = 2; - } else { - class247.musicPlayerStatus = 0; - } - - BuddyRankComparator.musicTrack = null; - class247.soundCache = null; + ++cycle; // L: 839 + this.doCycleJs5(); // L: 840 + Coord.method5011(); // L: 841 + class131.method2753(); // L: 842 + class14.playPcmPlayers(); // L: 843 + int var2; + synchronized(KeyHandler.KeyHandler_instance) { // L: 845 + ++KeyHandler.KeyHandler_idleCycles; // L: 846 + KeyHandler.field107 = KeyHandler.field131; // L: 847 + KeyHandler.field110 = 0; // L: 848 + KeyHandler.field135 = 0; // L: 849 + Arrays.fill(KeyHandler.field118, false); // L: 850 + Arrays.fill(KeyHandler.field119, false); // L: 851 + if (KeyHandler.field122 < 0) { // L: 852 + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 853 + KeyHandler.field122 = KeyHandler.field133; // L: 854 + } else { + while (KeyHandler.field133 != KeyHandler.field122) { // L: 857 + var2 = KeyHandler.field120[KeyHandler.field133]; // L: 858 + KeyHandler.field133 = KeyHandler.field133 + 1 & 127; // L: 859 + if (var2 < 0) { // L: 860 + var2 = ~var2; // L: 861 + if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 862 + KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 863 + KeyHandler.field119[var2] = true; // L: 864 + KeyHandler.field127[KeyHandler.field135] = var2; // L: 865 + ++KeyHandler.field135; // L: 866 } - } - } catch (Exception var9) { - var9.printStackTrace(); - class247.midiPcmStream.clear(); - class247.musicPlayerStatus = 0; - BuddyRankComparator.musicTrack = null; - class247.soundCache = null; - class113.musicTrackArchive = null; - } - - class356.playPcmPlayers(); - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field139 = KeyHandler.field126; - KeyHandler.field136 = 0; - KeyHandler.field140 = 0; - Arrays.fill(KeyHandler.field128, false); - Arrays.fill(KeyHandler.field129, false); - if (KeyHandler.field123 < 0) { - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); - KeyHandler.field123 = KeyHandler.field144; } else { - while (KeyHandler.field144 != KeyHandler.field123) { - int var6 = KeyHandler.field130[KeyHandler.field144]; - KeyHandler.field144 = KeyHandler.field144 + 1 & 127; - if (var6 < 0) { - var6 = ~var6; - if (KeyHandler.KeyHandler_pressedKeys[var6]) { - KeyHandler.KeyHandler_pressedKeys[var6] = false; - KeyHandler.field129[var6] = true; - KeyHandler.field137[KeyHandler.field140] = var6; - ++KeyHandler.field140; - } - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field136 < KeyHandler.field135.length - 1) { - KeyHandler.field128[var6] = true; - KeyHandler.field135[++KeyHandler.field136 - 1] = var6; - } + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field110 < KeyHandler.field125.length - 1) { // L: 870 + KeyHandler.field118[var2] = true; // L: 871 + KeyHandler.field125[++KeyHandler.field110 - 1] = var2; // L: 872 + } - KeyHandler.KeyHandler_pressedKeys[var6] = true; - } + KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 874 + } + } + } + + if (KeyHandler.field110 > 0) { // L: 878 + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field131 = KeyHandler.field130; // L: 879 + } + + ModeWhere.method5542(); // L: 882 + int var45; + if (MouseHandler.mouseWheel != null) { // L: 883 + var45 = MouseHandler.mouseWheel.useRotation(); // L: 884 + mouseWheelRotation = var45; // L: 885 + } + + if (gameState == 0) { // L: 887 + NetSocket.load(); // L: 888 + Clock.clock.mark(); // L: 890 + + for (var45 = 0; var45 < 32; ++var45) { // L: 891 + GameEngine.graphicsTickTimes[var45] = 0L; + } + + for (var45 = 0; var45 < 32; ++var45) { // L: 892 + GameEngine.clientTickTimes[var45] = 0L; + } + + class1.gameCyclesToDo = 0; // L: 893 + } else if (gameState == 5) { // L: 896 + class272.method5197(this, class6.fontPlain12); // L: 897 + NetSocket.load(); // L: 898 + Clock.clock.mark(); // L: 900 + + for (var45 = 0; var45 < 32; ++var45) { // L: 901 + GameEngine.graphicsTickTimes[var45] = 0L; + } + + for (var45 = 0; var45 < 32; ++var45) { // L: 902 + GameEngine.clientTickTimes[var45] = 0L; + } + + class1.gameCyclesToDo = 0; // L: 903 + } else if (gameState != 10 && gameState != 11) { // L: 906 + if (gameState == 20) { // L: 907 + class272.method5197(this, class6.fontPlain12); // L: 908 + this.doCycleLoggedOut(); // L: 909 + } else if (gameState == 25) { // L: 911 + MenuAction.method1912(false); // L: 912 + field521 = 0; // L: 913 + boolean var70 = true; // L: 914 + + for (var2 = 0; var2 < ModeWhere.regionLandArchives.length; ++var2) { // L: 915 + if (class119.regionMapArchiveIds[var2] != -1 && ModeWhere.regionLandArchives[var2] == null) { // L: 916 917 + ModeWhere.regionLandArchives[var2] = class11.archive5.takeFile(class119.regionMapArchiveIds[var2], 0); // L: 918 + if (ModeWhere.regionLandArchives[var2] == null) { // L: 919 + var70 = false; // L: 920 + ++field521; // L: 921 } } - if (KeyHandler.field136 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; + if (class21.regionLandArchiveIds[var2] != -1 && class184.regionMapArchives[var2] == null) { // L: 925 926 + class184.regionMapArchives[var2] = class11.archive5.takeFileEncrypted(class21.regionLandArchiveIds[var2], 0, xteaKeys[var2]); // L: 927 + if (class184.regionMapArchives[var2] == null) { // L: 928 + var70 = false; // L: 929 + ++field521; // L: 930 + } } - - KeyHandler.field126 = KeyHandler.field127; } - KeyHandler.method364(); - if (AccessFile.mouseWheel != null) { - var5 = AccessFile.mouseWheel.useRotation(); - mouseWheelRotation = var5; - } - - if (gameState == 0) { - class11.load(); - LoginPacket.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameEngine.graphicsTickTimes[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameEngine.clientTickTimes[var5] = 0L; - } - - GameEngine.gameCyclesToDo = 0; - } else if (gameState == 5) { - class87.method2196(this, class262.fontPlain12); - class11.load(); - ObjectSound.method1719(); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - class87.method2196(this, class262.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - WorldMapLabelSize.method3448(); - } + if (!var70) { // L: 935 + field485 = 1; // L: 936 } else { - class87.method2196(this, class262.fontPlain12); - } + field523 = 0; // L: 939 + var70 = true; // L: 940 - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); - } + int var4; + int var5; + for (var2 = 0; var2 < ModeWhere.regionLandArchives.length; ++var2) { // L: 941 + byte[] var3 = class184.regionMapArchives[var2]; // L: 942 + if (var3 != null) { // L: 943 + var4 = (LoginScreenAnimation.regions[var2] >> 8) * 64 - class19.baseX; // L: 944 + var5 = (LoginScreenAnimation.regions[var2] & 255) * 64 - DefaultsGroup.baseY; // L: 945 + if (isInInstance) { // L: 946 + var4 = 10; // L: 947 + var5 = 10; // L: 948 + } - return; + var70 &= class9.method69(var3, var4, var5); // L: 950 + } + } + + if (!var70) { // L: 953 + field485 = 2; // L: 954 + } else { + if (field485 != 0) { // L: 957 + class91.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + class14.playPcmPlayers(); // L: 958 + GameBuild.scene.clear(); // L: 959 + + for (var2 = 0; var2 < 4; ++var2) { // L: 960 + collisionMaps[var2].clear(); + } + + int var46; + for (var2 = 0; var2 < 4; ++var2) { // L: 961 + for (var46 = 0; var46 < 104; ++var46) { // L: 962 + for (var4 = 0; var4 < 104; ++var4) { // L: 963 + Tiles.Tiles_renderFlags[var2][var46][var4] = 0; // L: 964 + } + } + } + + class14.playPcmPlayers(); // L: 968 + Tiles.Tiles_minPlane = 99; // L: 970 + Tiles.Tiles_underlays = new byte[4][104][104]; // L: 971 + Tiles.Tiles_overlays = new byte[4][104][104]; // L: 972 + Tiles.Tiles_shapes = new byte[4][104][104]; // L: 973 + Tiles.field969 = new byte[4][104][104]; // L: 974 + Tiles.field962 = new int[4][105][105]; // L: 975 + class54.field419 = new byte[4][105][105]; // L: 976 + DirectByteArrayCopier.field3212 = new int[105][105]; // L: 977 + TileItem.Tiles_hue = new int[104]; // L: 978 + class397.Tiles_saturation = new int[104]; // L: 979 + Tiles.Tiles_lightness = new int[104]; // L: 980 + class1.Tiles_hueMultiplier = new int[104]; // L: 981 + MouseRecorder.field1039 = new int[104]; // L: 982 + var2 = ModeWhere.regionLandArchives.length; // L: 984 + + for (ObjectSound var59 = (ObjectSound)ObjectSound.objectSounds.last(); var59 != null; var59 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 986 + if (var59.stream1 != null) { // L: 987 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var59.stream1); // L: 988 + var59.stream1 = null; // L: 989 + } + + if (var59.stream2 != null) { // L: 991 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var59.stream2); // L: 992 + var59.stream2 = null; // L: 993 + } + } + + ObjectSound.objectSounds.clear(); // L: 996 + MenuAction.method1912(true); // L: 998 + int var48; + if (!isInInstance) { // L: 999 + byte[] var6; + for (var46 = 0; var46 < var2; ++var46) { // L: 1000 + var4 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1001 + var5 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1002 + var6 = ModeWhere.regionLandArchives[var46]; // L: 1003 + if (var6 != null) { // L: 1004 + class14.playPcmPlayers(); // L: 1005 + FontName.method6688(var6, var4, var5, ItemLayer.field2243 * 8 - 48, WallDecoration.field2630 * 8 - 48, collisionMaps); // L: 1006 + } + } + + for (var46 = 0; var46 < var2; ++var46) { // L: 1009 + var4 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1010 + var5 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1011 + var6 = ModeWhere.regionLandArchives[var46]; // L: 1012 + if (var6 == null && WallDecoration.field2630 < 800) { // L: 1013 + class14.playPcmPlayers(); // L: 1014 + class247.method4751(var4, var5, 64, 64); // L: 1015 + } + } + + MenuAction.method1912(true); // L: 1018 + + for (var46 = 0; var46 < var2; ++var46) { // L: 1019 + byte[] var47 = class184.regionMapArchives[var46]; // L: 1020 + if (var47 != null) { // L: 1021 + var5 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1022 + var48 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1023 + class14.playPcmPlayers(); // L: 1024 + PendingSpawn.method2162(var47, var5, var48, GameBuild.scene, collisionMaps); // L: 1025 + } + } + } + + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var21; + int var22; + int var23; + int var24; + int var25; + int var26; + int var27; + int var28; + int var29; + int var30; + int var32; + int var33; + int var34; + if (isInInstance) { // L: 1029 + var46 = 0; + + label1259: + while (true) { + if (var46 >= 4) { + for (var46 = 0; var46 < 13; ++var46) { // L: 1072 + for (var4 = 0; var4 < 13; ++var4) { // L: 1073 + var5 = instanceChunkTemplates[0][var46][var4]; // L: 1074 + if (var5 == -1) { // L: 1075 + class247.method4751(var46 * 8, var4 * 8, 8, 8); // L: 1076 + } + } + } + + MenuAction.method1912(true); // L: 1080 + var46 = 0; + + while (true) { + if (var46 >= 4) { + break label1259; + } + + class14.playPcmPlayers(); // L: 1082 + + for (var4 = 0; var4 < 13; ++var4) { // L: 1083 + label1182: + for (var5 = 0; var5 < 13; ++var5) { // L: 1084 + var48 = instanceChunkTemplates[var46][var4][var5]; // L: 1085 + if (var48 != -1) { // L: 1086 + var7 = var48 >> 24 & 3; // L: 1087 + var8 = var48 >> 1 & 3; // L: 1088 + var9 = var48 >> 14 & 1023; // L: 1089 + var10 = var48 >> 3 & 2047; // L: 1090 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 1091 + + for (var12 = 0; var12 < LoginScreenAnimation.regions.length; ++var12) { // L: 1092 + if (LoginScreenAnimation.regions[var12] == var11 && class184.regionMapArchives[var12] != null) { // L: 1093 + byte[] var49 = class184.regionMapArchives[var12]; // L: 1094 + var14 = var4 * 8; // L: 1095 + var15 = var5 * 8; // L: 1096 + var16 = (var9 & 7) * 8; // L: 1097 + var17 = (var10 & 7) * 8; // L: 1098 + Scene var18 = GameBuild.scene; // L: 1099 + CollisionMap[] var19 = collisionMaps; // L: 1100 + Buffer var20 = new Buffer(var49); // L: 1102 + var21 = -1; // L: 1103 + + while (true) { + var22 = var20.method6981(); // L: 1105 + if (var22 == 0) { // L: 1106 + continue label1182; + } + + var21 += var22; // L: 1107 + var23 = 0; // L: 1108 + + while (true) { + var24 = var20.readUShortSmart(); // L: 1110 + if (var24 == 0) { // L: 1111 + break; + } + + var23 += var24 - 1; // L: 1112 + var25 = var23 & 63; // L: 1113 + var26 = var23 >> 6 & 63; // L: 1114 + var27 = var23 >> 12; // L: 1115 + var28 = var20.readUnsignedByte(); // L: 1116 + var29 = var28 >> 2; // L: 1117 + var30 = var28 & 3; // L: 1118 + if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1119 + ObjectComposition var31 = KitDefinition.getObjectDefinition(var21); // L: 1120 + Object var10001 = null; // L: 1121 + var32 = var14 + SoundSystem.method780(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); + var10001 = null; // L: 1122 + var33 = var15 + WorldMapRectangle.method3960(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); + if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { // L: 1123 + var34 = var46; // L: 1124 + if ((Tiles.Tiles_renderFlags[1][var32][var33] & 2) == 2) { // L: 1125 + var34 = var46 - 1; + } + + CollisionMap var35 = null; // L: 1126 + if (var34 >= 0) { // L: 1127 + var35 = var19[var34]; + } + + class92.method2276(var46, var32, var33, var21, var8 + var30 & 3, var29, var18, var35); // L: 1128 + } + } + } + } + } + } + } + } + } + + ++var46; // L: 1081 + } + } + + class14.playPcmPlayers(); // L: 1031 + + for (var4 = 0; var4 < 13; ++var4) { // L: 1032 + for (var5 = 0; var5 < 13; ++var5) { // L: 1033 + boolean var71 = false; // L: 1034 + var7 = instanceChunkTemplates[var46][var4][var5]; // L: 1035 + if (var7 != -1) { // L: 1036 + var8 = var7 >> 24 & 3; // L: 1037 + var9 = var7 >> 1 & 3; // L: 1038 + var10 = var7 >> 14 & 1023; // L: 1039 + var11 = var7 >> 3 & 2047; // L: 1040 + var12 = (var10 / 8 << 8) + var11 / 8; // L: 1041 + + for (var13 = 0; var13 < LoginScreenAnimation.regions.length; ++var13) { // L: 1042 + if (LoginScreenAnimation.regions[var13] == var12 && ModeWhere.regionLandArchives[var13] != null) { // L: 1043 + FloorOverlayDefinition.method3427(ModeWhere.regionLandArchives[var13], var46, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var9, collisionMaps); // L: 1044 + var71 = true; // L: 1045 + break; // L: 1046 + } + } + } + + if (!var71) { // L: 1050 + var8 = var46; // L: 1051 + var9 = var4 * 8; // L: 1052 + var10 = var5 * 8; // L: 1053 + + for (var11 = 0; var11 < 8; ++var11) { // L: 1055 + for (var12 = 0; var12 < 8; ++var12) { // L: 1056 + Tiles.Tiles_heights[var8][var11 + var9][var10 + var12] = 0; + } + } + + if (var9 > 0) { // L: 1058 + for (var11 = 1; var11 < 8; ++var11) { // L: 1059 + Tiles.Tiles_heights[var8][var9][var10 + var11] = Tiles.Tiles_heights[var8][var9 - 1][var11 + var10]; + } + } + + if (var10 > 0) { // L: 1061 + for (var11 = 1; var11 < 8; ++var11) { // L: 1062 + Tiles.Tiles_heights[var8][var9 + var11][var10] = Tiles.Tiles_heights[var8][var9 + var11][var10 - 1]; + } + } + + if (var9 > 0 && Tiles.Tiles_heights[var8][var9 - 1][var10] != 0) { // L: 1064 + Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9 - 1][var10]; + } else if (var10 > 0 && Tiles.Tiles_heights[var8][var9][var10 - 1] != 0) { // L: 1065 + Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9][var10 - 1]; + } else if (var9 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var9 - 1][var10 - 1] != 0) { // L: 1066 + Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9 - 1][var10 - 1]; + } + } + } + } + + ++var46; // L: 1030 + } + } + + MenuAction.method1912(true); // L: 1142 + class14.playPcmPlayers(); // L: 1143 + Scene var60 = GameBuild.scene; // L: 1144 + CollisionMap[] var69 = collisionMaps; // L: 1145 + + for (var5 = 0; var5 < 4; ++var5) { // L: 1147 + for (var48 = 0; var48 < 104; ++var48) { // L: 1148 + for (var7 = 0; var7 < 104; ++var7) { // L: 1149 + if ((Tiles.Tiles_renderFlags[var5][var48][var7] & 1) == 1) { // L: 1150 + var8 = var5; // L: 1151 + if ((Tiles.Tiles_renderFlags[1][var48][var7] & 2) == 2) { // L: 1152 + var8 = var5 - 1; + } + + if (var8 >= 0) { // L: 1153 + var69[var8].setBlockedByFloor(var48, var7); + } + } + } + } + } + + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 1158 + if (Tiles.rndHue < -8) { // L: 1159 + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { // L: 1160 + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 1161 + if (Tiles.rndLightness < -16) { // L: 1162 + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { // L: 1163 + Tiles.rndLightness = 16; + } + + int[] var10000; + int var50; + int var51; + int var52; + for (var5 = 0; var5 < 4; ++var5) { // L: 1164 + byte[][] var61 = class54.field419[var5]; // L: 1165 + var12 = (int)Math.sqrt(5100.0D); // L: 1171 + var13 = var12 * 768 >> 8; // L: 1172 + + for (var14 = 1; var14 < 103; ++var14) { // L: 1173 + for (var15 = 1; var15 < 103; ++var15) { // L: 1174 + var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1175 + var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1176 + var50 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); // L: 1177 + var51 = (var16 << 8) / var50; // L: 1178 + var52 = 65536 / var50; // L: 1179 + var21 = (var17 << 8) / var50; // L: 1180 + var22 = (var51 * -50 + var21 * -50 + var52 * -10) / var13 + 96; // L: 1181 + var23 = (var61[var15][var14 + 1] >> 3) + (var61[var15 - 1][var14] >> 2) + (var61[var15][var14 - 1] >> 2) + (var61[var15 + 1][var14] >> 3) + (var61[var15][var14] >> 1); // L: 1182 + DirectByteArrayCopier.field3212[var15][var14] = var22 - var23; // L: 1183 + } + } + + for (var14 = 0; var14 < 104; ++var14) { // L: 1186 + TileItem.Tiles_hue[var14] = 0; // L: 1187 + class397.Tiles_saturation[var14] = 0; // L: 1188 + Tiles.Tiles_lightness[var14] = 0; // L: 1189 + class1.Tiles_hueMultiplier[var14] = 0; // L: 1190 + MouseRecorder.field1039[var14] = 0; // L: 1191 + } + + for (var14 = -5; var14 < 109; ++var14) { // L: 1193 + for (var15 = 0; var15 < 104; ++var15) { // L: 1194 + var16 = var14 + 5; // L: 1195 + int var10002; + if (var16 >= 0 && var16 < 104) { // L: 1196 + var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; // L: 1197 + if (var17 > 0) { // L: 1198 + var51 = var17 - 1; // L: 1200 + FloorUnderlayDefinition var67 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var51); // L: 1202 + FloorUnderlayDefinition var64; + if (var67 != null) { // L: 1203 + var64 = var67; // L: 1204 + } else { + byte[] var53 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var51); // L: 1207 + var67 = new FloorUnderlayDefinition(); // L: 1208 + if (var53 != null) { // L: 1209 + var67.decode(new Buffer(var53), var51); + } + + var67.postDecode(); // L: 1210 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var67, (long)var51); // L: 1211 + var64 = var67; // L: 1212 + } + + var10000 = TileItem.Tiles_hue; // L: 1215 + var10000[var15] += var64.hue; + var10000 = class397.Tiles_saturation; // L: 1216 + var10000[var15] += var64.saturation; + var10000 = Tiles.Tiles_lightness; // L: 1217 + var10000[var15] += var64.lightness; + var10000 = class1.Tiles_hueMultiplier; // L: 1218 + var10000[var15] += var64.hueMultiplier; + var10002 = MouseRecorder.field1039[var15]++; // L: 1219 + } + } + + var17 = var14 - 5; // L: 1222 + if (var17 >= 0 && var17 < 104) { // L: 1223 + var50 = Tiles.Tiles_underlays[var5][var17][var15] & 255; // L: 1224 + if (var50 > 0) { // L: 1225 + var52 = var50 - 1; // L: 1227 + FloorUnderlayDefinition var72 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var52); // L: 1229 + FloorUnderlayDefinition var65; + if (var72 != null) { // L: 1230 + var65 = var72; // L: 1231 + } else { + byte[] var54 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var52); // L: 1234 + var72 = new FloorUnderlayDefinition(); // L: 1235 + if (var54 != null) { // L: 1236 + var72.decode(new Buffer(var54), var52); + } + + var72.postDecode(); // L: 1237 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var72, (long)var52); // L: 1238 + var65 = var72; // L: 1239 + } + + var10000 = TileItem.Tiles_hue; // L: 1242 + var10000[var15] -= var65.hue; + var10000 = class397.Tiles_saturation; // L: 1243 + var10000[var15] -= var65.saturation; + var10000 = Tiles.Tiles_lightness; // L: 1244 + var10000[var15] -= var65.lightness; + var10000 = class1.Tiles_hueMultiplier; // L: 1245 + var10000[var15] -= var65.hueMultiplier; + var10002 = MouseRecorder.field1039[var15]--; // L: 1246 + } + } + } + + if (var14 >= 1 && var14 < 103) { // L: 1250 + var15 = 0; // L: 1251 + var16 = 0; // L: 1252 + var17 = 0; // L: 1253 + var50 = 0; // L: 1254 + var51 = 0; // L: 1255 + + for (var52 = -5; var52 < 109; ++var52) { // L: 1256 + var21 = var52 + 5; // L: 1257 + if (var21 >= 0 && var21 < 104) { // L: 1258 + var15 += TileItem.Tiles_hue[var21]; // L: 1259 + var16 += class397.Tiles_saturation[var21]; // L: 1260 + var17 += Tiles.Tiles_lightness[var21]; // L: 1261 + var50 += class1.Tiles_hueMultiplier[var21]; // L: 1262 + var51 += MouseRecorder.field1039[var21]; // L: 1263 + } + + var22 = var52 - 5; // L: 1265 + if (var22 >= 0 && var22 < 104) { // L: 1266 + var15 -= TileItem.Tiles_hue[var22]; // L: 1267 + var16 -= class397.Tiles_saturation[var22]; // L: 1268 + var17 -= Tiles.Tiles_lightness[var22]; // L: 1269 + var50 -= class1.Tiles_hueMultiplier[var22]; // L: 1270 + var51 -= MouseRecorder.field1039[var22]; // L: 1271 + } + + if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { // L: 1273 1274 1275 1276 + if (var5 < Tiles.Tiles_minPlane) { // L: 1279 + Tiles.Tiles_minPlane = var5; + } + + var23 = Tiles.Tiles_underlays[var5][var14][var52] & 255; // L: 1280 + var24 = Tiles.Tiles_overlays[var5][var14][var52] & 255; // L: 1281 + if (var23 > 0 || var24 > 0) { // L: 1282 + var25 = Tiles.Tiles_heights[var5][var14][var52]; // L: 1283 + var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; // L: 1284 + var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; // L: 1285 + var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; // L: 1286 + var29 = DirectByteArrayCopier.field3212[var14][var52]; // L: 1287 + var30 = DirectByteArrayCopier.field3212[var14 + 1][var52]; // L: 1288 + int var55 = DirectByteArrayCopier.field3212[var14 + 1][var52 + 1]; // L: 1289 + var32 = DirectByteArrayCopier.field3212[var14][var52 + 1]; // L: 1290 + var33 = -1; // L: 1291 + var34 = -1; // L: 1292 + int var36; + int var56; + if (var23 > 0) { // L: 1293 + var56 = var15 * 256 / var50; // L: 1294 + var36 = var16 / var51; // L: 1295 + int var37 = var17 / var51; // L: 1296 + var33 = class17.hslToRgb(var56, var36, var37); // L: 1297 + var56 = var56 + Tiles.rndHue & 255; // L: 1298 + var37 += Tiles.rndLightness; // L: 1299 + if (var37 < 0) { // L: 1300 + var37 = 0; + } else if (var37 > 255) { // L: 1301 + var37 = 255; + } + + var34 = class17.hslToRgb(var56, var36, var37); // L: 1302 + } + + if (var5 > 0) { // L: 1304 + boolean var73 = true; // L: 1305 + if (var23 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { // L: 1306 + var73 = false; + } + + if (var24 > 0 && !InvDefinition.method2987(var24 - 1).hideUnderlay) { // L: 1307 + var73 = false; + } + + if (var73 && var26 == var25 && var25 == var27 && var25 == var28) { // L: 1308 1309 + var10000 = Tiles.field962[var5][var14]; + var10000[var52] |= 2340; + } + } + + var56 = 0; // L: 1312 + if (var34 != -1) { // L: 1313 + var56 = Rasterizer3D.Rasterizer3D_colorPalette[UserComparator8.method2456(var34, 96)]; + } + + if (var24 == 0) { // L: 1314 + var60.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, UserComparator8.method2456(var33, var29), UserComparator8.method2456(var33, var30), UserComparator8.method2456(var33, var55), UserComparator8.method2456(var33, var32), 0, 0, 0, 0, var56, 0); // L: 1315 + } else { + var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; // L: 1318 + byte var68 = Tiles.field969[var5][var14][var52]; // L: 1319 + FloorOverlayDefinition var38 = InvDefinition.method2987(var24 - 1); // L: 1320 + int var39 = var38.texture; // L: 1321 + int var40; + int var41; + int var42; + int var43; + if (var39 >= 0) { // L: 1324 + var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1325 + var40 = -1; // L: 1326 + } else if (var38.primaryRgb == 16711935) { // L: 1329 + var40 = -2; // L: 1330 + var39 = -1; // L: 1331 + var41 = -2; // L: 1332 + } else { + var40 = class17.hslToRgb(var38.hue, var38.saturation, var38.lightness); // L: 1335 + var42 = var38.hue + Tiles.rndHue & 255; // L: 1336 + var43 = var38.lightness + Tiles.rndLightness; // L: 1337 + if (var43 < 0) { // L: 1338 + var43 = 0; + } else if (var43 > 255) { // L: 1339 + var43 = 255; + } + + var41 = class17.hslToRgb(var42, var38.saturation, var43); // L: 1340 + } + + var42 = 0; // L: 1343 + if (var41 != -2) { // L: 1344 + var42 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method3885(var41, 96)]; + } + + if (var38.secondaryRgb != -1) { // L: 1345 + var43 = var38.secondaryHue + Tiles.rndHue & 255; // L: 1346 + int var44 = var38.secondaryLightness + Tiles.rndLightness; // L: 1347 + if (var44 < 0) { // L: 1348 + var44 = 0; + } else if (var44 > 255) { // L: 1349 + var44 = 255; + } + + var41 = class17.hslToRgb(var43, var38.secondarySaturation, var44); // L: 1350 + var42 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method3885(var41, 96)]; // L: 1351 + } + + var60.addTile(var5, var14, var52, var36, var68, var39, var25, var26, var27, var28, UserComparator8.method2456(var33, var29), UserComparator8.method2456(var33, var30), UserComparator8.method2456(var33, var55), UserComparator8.method2456(var33, var32), WorldMapIcon_0.method3885(var40, var29), WorldMapIcon_0.method3885(var40, var30), WorldMapIcon_0.method3885(var40, var55), WorldMapIcon_0.method3885(var40, var32), var56, var42); // L: 1353 + } + } + } + } + } + } + + for (var14 = 1; var14 < 103; ++var14) { // L: 1360 + for (var15 = 1; var15 < 103; ++var15) { // L: 1361 + if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { // L: 1368 + var52 = 0; // L: 1369 + } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { // L: 1372 + var52 = var5 - 1; // L: 1373 + } else { + var52 = var5; // L: 1376 + } + + var60.setTileMinPlane(var5, var15, var14, var52); // L: 1378 + } + } + + Tiles.Tiles_underlays[var5] = null; // L: 1381 + Tiles.Tiles_overlays[var5] = null; // L: 1382 + Tiles.Tiles_shapes[var5] = null; // L: 1383 + Tiles.field969[var5] = null; // L: 1384 + class54.field419[var5] = null; // L: 1385 + } + + var60.method4310(-50, -10, -50); // L: 1387 + + for (var5 = 0; var5 < 104; ++var5) { // L: 1388 + for (var48 = 0; var48 < 104; ++var48) { // L: 1389 + if ((Tiles.Tiles_renderFlags[1][var5][var48] & 2) == 2) { // L: 1390 + var60.setLinkBelow(var5, var48); + } + } + } + + var5 = 1; // L: 1393 + var48 = 2; // L: 1394 + var7 = 4; // L: 1395 + + for (var8 = 0; var8 < 4; ++var8) { // L: 1396 + if (var8 > 0) { // L: 1397 + var5 <<= 3; // L: 1398 + var48 <<= 3; // L: 1399 + var7 <<= 3; // L: 1400 + } + + for (var9 = 0; var9 <= var8; ++var9) { // L: 1402 + for (var10 = 0; var10 <= 104; ++var10) { // L: 1403 + for (var11 = 0; var11 <= 104; ++var11) { // L: 1404 + short var66; + if ((Tiles.field962[var9][var11][var10] & var5) != 0) { // L: 1405 + var12 = var10; // L: 1406 + var13 = var10; // L: 1407 + var14 = var9; // L: 1408 + + for (var15 = var9; var12 > 0 && (Tiles.field962[var9][var11][var12 - 1] & var5) != 0; --var12) { // L: 1409 1410 + } + + while (var13 < 104 && (Tiles.field962[var9][var11][var13 + 1] & var5) != 0) { // L: 1411 + ++var13; + } + + label901: + while (var14 > 0) { // L: 1412 + for (var16 = var12; var16 <= var13; ++var16) { // L: 1413 + if ((Tiles.field962[var14 - 1][var11][var16] & var5) == 0) { + break label901; + } + } + + --var14; // L: 1414 + } + + label890: + while (var15 < var8) { // L: 1416 + for (var16 = var12; var16 <= var13; ++var16) { // L: 1417 + if ((Tiles.field962[var15 + 1][var11][var16] & var5) == 0) { + break label890; + } + } + + ++var15; // L: 1418 + } + + var16 = (var15 + 1 - var14) * (var13 - var12 + 1); // L: 1420 + if (var16 >= 8) { // L: 1421 + var66 = 240; // L: 1422 + var50 = Tiles.Tiles_heights[var15][var11][var12] - var66; // L: 1423 + var51 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1424 + Scene.Scene_addOccluder(var8, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var50, var51); // L: 1425 + + for (var52 = var14; var52 <= var15; ++var52) { // L: 1426 + for (var21 = var12; var21 <= var13; ++var21) { // L: 1427 + var10000 = Tiles.field962[var52][var11]; + var10000[var21] &= ~var5; + } + } + } + } + + if ((Tiles.field962[var9][var11][var10] & var48) != 0) { // L: 1431 + var12 = var11; // L: 1432 + var13 = var11; // L: 1433 + var14 = var9; // L: 1434 + + for (var15 = var9; var12 > 0 && (Tiles.field962[var9][var12 - 1][var10] & var48) != 0; --var12) { // L: 1435 1436 + } + + while (var13 < 104 && (Tiles.field962[var9][var13 + 1][var10] & var48) != 0) { // L: 1437 + ++var13; + } + + label954: + while (var14 > 0) { // L: 1438 + for (var16 = var12; var16 <= var13; ++var16) { // L: 1439 + if ((Tiles.field962[var14 - 1][var16][var10] & var48) == 0) { + break label954; + } + } + + --var14; // L: 1440 + } + + label943: + while (var15 < var8) { // L: 1442 + for (var16 = var12; var16 <= var13; ++var16) { // L: 1443 + if ((Tiles.field962[var15 + 1][var16][var10] & var48) == 0) { + break label943; + } + } + + ++var15; // L: 1444 + } + + var16 = (var13 - var12 + 1) * (var15 + 1 - var14); // L: 1446 + if (var16 >= 8) { // L: 1447 + var66 = 240; // L: 1448 + var50 = Tiles.Tiles_heights[var15][var12][var10] - var66; // L: 1449 + var51 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1450 + Scene.Scene_addOccluder(var8, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var50, var51); // L: 1451 + + for (var52 = var14; var52 <= var15; ++var52) { // L: 1452 + for (var21 = var12; var21 <= var13; ++var21) { // L: 1453 + var10000 = Tiles.field962[var52][var21]; + var10000[var10] &= ~var48; + } + } + } + } + + if ((Tiles.field962[var9][var11][var10] & var7) != 0) { // L: 1457 + var12 = var11; // L: 1458 + var13 = var11; // L: 1459 + var14 = var10; // L: 1460 + + for (var15 = var10; var14 > 0 && (Tiles.field962[var9][var11][var14 - 1] & var7) != 0; --var14) { // L: 1461 1462 + } + + while (var15 < 104 && (Tiles.field962[var9][var11][var15 + 1] & var7) != 0) { // L: 1463 + ++var15; + } + + label1007: + while (var12 > 0) { // L: 1464 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1465 + if ((Tiles.field962[var9][var12 - 1][var16] & var7) == 0) { + break label1007; + } + } + + --var12; // L: 1466 + } + + label996: + while (var13 < 104) { // L: 1468 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1469 + if ((Tiles.field962[var9][var13 + 1][var16] & var7) == 0) { + break label996; + } + } + + ++var13; // L: 1470 + } + + if ((var13 - var12 + 1) * (var15 - var14 + 1) >= 4) { // L: 1472 + var16 = Tiles.Tiles_heights[var9][var12][var14]; // L: 1473 + Scene.Scene_addOccluder(var8, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1474 + + for (var17 = var12; var17 <= var13; ++var17) { // L: 1475 + for (var50 = var14; var50 <= var15; ++var50) { // L: 1476 + var10000 = Tiles.field962[var9][var17]; + var10000[var50] &= ~var7; + } + } + } + } + } + } + } + } + + MenuAction.method1912(true); // L: 1485 + var5 = Tiles.Tiles_minPlane; // L: 1486 + if (var5 > GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 1487 + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + + if (var5 < GrandExchangeOfferTotalQuantityComparator.Client_plane - 1) { // L: 1488 + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane - 1; + } + + if (isLowDetail) { // L: 1489 + GameBuild.scene.init(Tiles.Tiles_minPlane); + } else { + GameBuild.scene.init(0); // L: 1490 + } + + for (var48 = 0; var48 < 104; ++var48) { // L: 1491 + for (var7 = 0; var7 < 104; ++var7) { // L: 1492 + WallDecoration.updateItemPile(var48, var7); // L: 1493 + } + } + + class14.playPcmPlayers(); // L: 1496 + + for (PendingSpawn var62 = (PendingSpawn)pendingSpawns.last(); var62 != null; var62 = (PendingSpawn)pendingSpawns.previous()) { // L: 1498 1499 1505 + if (var62.hitpoints == -1) { // L: 1500 + var62.delay = 0; // L: 1501 + class14.method180(var62); // L: 1502 + } else { + var62.remove(); // L: 1504 + } + } + + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1508 + PacketBufferNode var63; + if (ArchiveLoader.client.hasFrame()) { // L: 1509 + var63 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2679, packetWriter.isaacCipher); // L: 1511 + var63.packetBuffer.writeInt(1057001181); // L: 1512 + packetWriter.addNode(var63); // L: 1513 + } + + if (!isInInstance) { // L: 1515 + var48 = (ItemLayer.field2243 - 6) / 8; // L: 1516 + var7 = (ItemLayer.field2243 + 6) / 8; // L: 1517 + var8 = (WallDecoration.field2630 - 6) / 8; // L: 1518 + var9 = (WallDecoration.field2630 + 6) / 8; // L: 1519 + + for (var10 = var48 - 1; var10 <= var7 + 1; ++var10) { // L: 1520 + for (var11 = var8 - 1; var11 <= var9 + 1; ++var11) { // L: 1521 + if (var10 < var48 || var10 > var7 || var11 < var8 || var11 > var9) { // L: 1522 + class11.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1523 + class11.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1524 + } + } + } + } + + WorldMapData_1.updateGameState(30); // L: 1528 + class14.playPcmPlayers(); // L: 1529 + class113.method2533(); // L: 1530 + var63 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2713, packetWriter.isaacCipher); // L: 1531 + packetWriter.addNode(var63); // L: 1532 + Clock.clock.mark(); // L: 1534 + + for (var7 = 0; var7 < 32; ++var7) { // L: 1535 + GameEngine.graphicsTickTimes[var7] = 0L; + } + + for (var7 = 0; var7 < 32; ++var7) { // L: 1536 + GameEngine.clientTickTimes[var7] = 0L; + } + + class1.gameCyclesToDo = 0; // L: 1537 + } + } } - - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); + } else { + class272.method5197(this, class6.fontPlain12); } - } - @ObfuscatedName("ad") + if (gameState == 30) { // L: 1540 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 1541 + this.doCycleLoggedOut(); + } + + } // L: 1542 + + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-296185885" + garbageValue = "1302395481" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label167: { + label166: { try { - if (class247.musicPlayerStatus == 2) { - if (BuddyRankComparator.musicTrack == null) { - BuddyRankComparator.musicTrack = MusicTrack.readTrack(class113.musicTrackArchive, Skills.musicTrackGroupId, class137.musicTrackFileId); - if (BuddyRankComparator.musicTrack == null) { - var2 = false; - break label167; + if (class247.musicPlayerStatus == 2) { // L: 1548 + if (class14.musicTrack == null) { // L: 1549 + class14.musicTrack = MusicTrack.readTrack(class128.musicTrackArchive, FillMode.musicTrackGroupId, ArchiveDiskActionHandler.musicTrackFileId); // L: 1550 + if (class14.musicTrack == null) { // L: 1551 + var2 = false; // L: 1552 + break label166; } } - if (class247.soundCache == null) { - class247.soundCache = new SoundCache(class247.soundEffectsArchive, GrandExchangeOfferWorldComparator.musicSamplesArchive); + if (class247.soundCache == null) { // L: 1556 + class247.soundCache = new SoundCache(class408.soundEffectsArchive, class247.musicSamplesArchive); } - if (class247.midiPcmStream.loadMusicTrack(BuddyRankComparator.musicTrack, class247.musicPatchesArchive, class247.soundCache, 22050)) { - class247.midiPcmStream.clearAll(); - class247.midiPcmStream.setPcmStreamVolume(class247.musicTrackVolume); - class247.midiPcmStream.setMusicTrack(BuddyRankComparator.musicTrack, class247.musicTrackBoolean); - class247.musicPlayerStatus = 0; - BuddyRankComparator.musicTrack = null; - class247.soundCache = null; - class113.musicTrackArchive = null; - var2 = true; - break label167; + if (class247.midiPcmStream.loadMusicTrack(class14.musicTrack, class247.musicPatchesArchive, class247.soundCache, 22050)) { // L: 1557 + class247.midiPcmStream.clearAll(); // L: 1558 + class247.midiPcmStream.setPcmStreamVolume(class247.musicTrackVolume); // L: 1559 + class247.midiPcmStream.setMusicTrack(class14.musicTrack, SecureRandomCallable.musicTrackBoolean); // L: 1560 + class247.musicPlayerStatus = 0; // L: 1561 + class14.musicTrack = null; // L: 1562 + class247.soundCache = null; // L: 1563 + class128.musicTrackArchive = null; // L: 1564 + var2 = true; // L: 1565 + break label166; } } - } catch (Exception var6) { - var6.printStackTrace(); - class247.midiPcmStream.clear(); - class247.musicPlayerStatus = 0; - BuddyRankComparator.musicTrack = null; - class247.soundCache = null; - class113.musicTrackArchive = null; + } catch (Exception var6) { // L: 1570 + var6.printStackTrace(); // L: 1571 + class247.midiPcmStream.clear(); // L: 1572 + class247.musicPlayerStatus = 0; // L: 1573 + class14.musicTrack = null; // L: 1574 + class247.soundCache = null; // L: 1575 + class128.musicTrackArchive = null; // L: 1576 } - var2 = false; + var2 = false; // L: 1578 } - if (var2 && field663 && class126.pcmPlayer0 != null) { - class126.pcmPlayer0.tryDiscard(); + if (var2 && field710 && HealthBar.pcmPlayer0 != null) { // L: 1581 1582 + HealthBar.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field708 && UserComparator4.method2406() > field708) { - class392.setWindowedMode(class12.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field687 && class111.method2516() > field687) { // L: 1584 1585 + HorizontalAlignment.setWindowedMode(class134.getWindowedMode()); // L: 1586 } int var4; - if (var1) { - for (var4 = 0; var4 < 100; ++var4) { - field710[var4] = true; + if (var1) { // L: 1589 + for (var4 = 0; var4 < 100; ++var4) { // L: 1590 + field594[var4] = true; } } - if (gameState == 0) { + if (gameState == 0) { // L: 1592 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { - Player.drawTitle(Interpreter.fontBold12, UserComparator8.fontPlain11, class262.fontPlain12); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - Player.drawTitle(Interpreter.fontBold12, UserComparator8.fontPlain11, class262.fontPlain12); - } else if (gameState == 25) { - if (field534 == 1) { - if (field764 > field544) { - field544 = field764; + } else if (gameState == 5) { // L: 1593 + class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1594 + if (gameState == 20) { // L: 1595 + class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12); + } else if (gameState == 25) { // L: 1596 + if (field485 == 1) { // L: 1597 + if (field521 > field522) { // L: 1598 + field522 = field521; } - var4 = (field544 * 50 - field764 * 50) / field544; - ScriptFrame.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field534 == 2) { - if (field545 > field546) { - field546 = field545; + var4 = (field522 * 50 - field521 * 50) / field522; // L: 1599 + class91.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1600 + } else if (field485 == 2) { // L: 1602 + if (field523 > field524) { // L: 1603 + field524 = field523; } - var4 = (field546 * 50 - field545 * 50) / field546 + 50; - ScriptFrame.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var4 = (field524 * 50 - field523 * 50) / field524 + 50; // L: 1604 + class91.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1605 } else { - ScriptFrame.drawLoadingMessage("Loading - please wait.", false); + class91.drawLoadingMessage("Loading - please wait.", false); // L: 1607 } - } else if (gameState == 30) { + } else if (gameState == 30) { // L: 1609 this.drawLoggedIn(); - } else if (gameState == 40) { - ScriptFrame.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { - ScriptFrame.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1610 + class91.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1611 + class91.drawLoadingMessage("Please wait...", false); } } else { - Player.drawTitle(Interpreter.fontBold12, UserComparator8.fontPlain11, class262.fontPlain12); + class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field701[var4]) { - class244.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field701[var4] = false; + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1612 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1613 + if (field553[var4]) { // L: 1614 + Canvas.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1615 + field553[var4] = false; // L: 1616 } } - } else if (gameState > 0) { - class244.rasterProvider.drawFull(0, 0); + } else if (gameState > 0) { // L: 1620 + Canvas.rasterProvider.drawFull(0, 0); // L: 1621 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field701[var4] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1622 + field553[var4] = false; } } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" - ) - @Export("kill0") - protected final void kill0() { - if (Tile.varcs.hasUnwrittenChanges()) { - Tile.varcs.write(); - } - - if (ClientPreferences.mouseRecorder != null) { - ClientPreferences.mouseRecorder.isRunning = false; - } - - ClientPreferences.mouseRecorder = null; - packetWriter.close(); - HealthBarUpdate.method2161(); - Language.method5469(); - AccessFile.mouseWheel = null; - if (class126.pcmPlayer0 != null) { - class126.pcmPlayer0.shutdown(); - } - - if (class116.pcmPlayer1 != null) { - class116.pcmPlayer1.shutdown(); - } - - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3671 != 0) { - ArchiveDiskActionHandler.field3671 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var5) { - } - } - } - - if (WorldMapSection0.urlRequester != null) { - WorldMapSection0.urlRequester.close(); - WorldMapSection0.urlRequester = null; - } - - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var4 = 0; var4 < Bounds.idxCount; ++var4) { - JagexCache.JagexCache_idxFiles[var4].close(); - } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var6) { - } - - this.field522.method172(); - } + } // L: 1624 @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1826906753" + descriptor = "(S)V", + garbageValue = "-9054" ) - protected final void vmethod1165() { - } + @Export("kill0") + protected final void kill0() { + if (Message.varcs.hasUnwrittenChanges()) { // L: 1627 + Message.varcs.write(); + } - @ObfuscatedName("ej") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-28" - ) - boolean method1338() { - return WorldMapSectionType.field2140 != null && !WorldMapSectionType.field2140.trim().isEmpty(); - } + if (Interpreter.mouseRecorder != null) { // L: 1628 + Interpreter.mouseRecorder.isRunning = false; + } - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-52448415" - ) - void method1110(String var1) throws MalformedURLException, IOException { - class10 var2 = new class10(new URL(Varcs.field1264 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field43); - var2.method91("Authorization", "Bearer " + var1); - this.field523 = this.field522.method178(var2); - } + Interpreter.mouseRecorder = null; // L: 1629 + packetWriter.close(); // L: 1630 + if (KeyHandler.KeyHandler_instance != null) { // L: 1632 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1633 + KeyHandler.KeyHandler_instance = null; // L: 1634 + } // L: 1635 + } - @ObfuscatedName("eg") + NPC.method2248(); // L: 1638 + MouseHandler.mouseWheel = null; // L: 1639 + if (HealthBar.pcmPlayer0 != null) { // L: 1640 + HealthBar.pcmPlayer0.shutdown(); + } + + if (ScriptEvent.pcmPlayer1 != null) { // L: 1641 + ScriptEvent.pcmPlayer1.shutdown(); + } + + Script.method1989(); // L: 1642 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1644 + if (ArchiveDiskActionHandler.field3662 != 0) { // L: 1645 + ArchiveDiskActionHandler.field3662 = 1; // L: 1646 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1648 + } catch (InterruptedException var5) { // L: 1650 + } + } + } + + if (class320.urlRequester != null) { // L: 1654 + class320.urlRequester.close(); // L: 1655 + class320.urlRequester = null; // L: 1656 + } + + try { + JagexCache.JagexCache_dat2File.close(); // L: 1660 + + for (int var4 = 0; var4 < ItemContainer.idxCount; ++var4) { // L: 1661 + WorldMapID.JagexCache_idxFiles[var4].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 1662 + JagexCache.JagexCache_randomDat.close(); // L: 1663 + } catch (Exception var7) { // L: 1665 + } + + this.field491.method181(); // L: 1667 + } // L: 1668 + + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "13" + garbageValue = "-71" + ) + protected final void vmethod1164() { + } // L: 652 + + @ObfuscatedName("eq") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-863844580" + ) + boolean method1166() { + return JagexCache.field1560 != null && !JagexCache.field1560.trim().isEmpty(); // L: 784 + } + + @ObfuscatedName("es") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1299370997" + ) + void method1453(String var1) throws MalformedURLException, IOException { + class10 var2 = new class10(new URL(WorldMapSection1.field2203 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field27); // L: 788 + var2.method86("Authorization", "Bearer " + var1); // L: 789 + this.field537 = this.field491.method187(var2); // L: 790 + } // L: 791 + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "23725" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { - long var2 = UserComparator4.method2406(); - int var4 = (int)(var2 - NetCache.field3715); - NetCache.field3715 = var2; - if (var4 > 200) { + if (gameState != 1000) { // L: 1713 + long var2 = class111.method2516(); // L: 1716 + int var4 = (int)(var2 - class423.field4436); // L: 1717 + class423.field4436 = var2; // L: 1718 + if (var4 > 200) { // L: 1719 var4 = 200; } - NetCache.NetCache_loadTime += var4; + NetCache.NetCache_loadTime += var4; // L: 1720 boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - var1 = true; - } else if (NetCache.NetCache_socket == null) { - var1 = false; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1721 + var1 = true; // L: 1722 + } else if (NetCache.NetCache_socket == null) { // L: 1725 + var1 = false; // L: 1726 } else { try { - label238: { - if (NetCache.NetCache_loadTime > 30000) { + label245: { + if (NetCache.NetCache_loadTime > 30000) { // L: 1730 throw new IOException(); } NetFileRequest var5; Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var6 = new Buffer(4); - var6.writeByte(1); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1731 + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1732 + var6 = new Buffer(4); // L: 1733 + var6.writeByte(1); // L: 1734 + var6.writeMedium((int)var5.key); // L: 1735 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1736 + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1737 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 1738 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1739 } - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var6 = new Buffer(4); - var6.writeByte(0); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - var5.removeDual(); - NetCache.NetCache_pendingResponses.put(var5, var5.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1741 + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1742 + var6 = new Buffer(4); // L: 1743 + var6.writeByte(0); // L: 1744 + var6.writeMedium((int)var5.key); // L: 1745 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1746 + var5.removeDual(); // L: 1747 + NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1748 + --NetCache.NetCache_pendingWritesCount; // L: 1749 + ++NetCache.NetCache_pendingResponsesCount; // L: 1750 } - for (int var17 = 0; var17 < 100; ++var17) { - int var18 = NetCache.NetCache_socket.available(); - if (var18 < 0) { + for (int var17 = 0; var17 < 100; ++var17) { // L: 1752 + int var18 = NetCache.NetCache_socket.available(); // L: 1753 + if (var18 < 0) { // L: 1754 throw new IOException(); } - if (var18 == 0) { + if (var18 == 0) { // L: 1755 break; } - NetCache.NetCache_loadTime = 0; - byte var7 = 0; - if (ClanChannel.NetCache_currentResponse == null) { + NetCache.NetCache_loadTime = 0; // L: 1756 + byte var7 = 0; // L: 1757 + if (class131.NetCache_currentResponse == null) { // L: 1758 var7 = 8; - } else if (NetCache.field3726 == 0) { + } else if (NetCache.field3707 == 0) { // L: 1759 var7 = 1; } @@ -2114,1013 +2949,992 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { byte[] var10000; int var10001; Buffer var25; - if (var7 > 0) { - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var8 > var18) { + if (var7 > 0) { // L: 1760 + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1761 + if (var8 > var18) { // L: 1762 var8 = var18; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); - if (NetCache.field3724 != 0) { - for (var9 = 0; var9 < var8; ++var9) { + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1763 + if (NetCache.field3719 != 0) { // L: 1764 + for (var9 = 0; var9 < var8; ++var9) { // L: 1765 var10000 = NetCache.NetCache_responseHeaderBuffer.array; var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3724; + var10000[var10001] ^= NetCache.field3719; } } - var25 = NetCache.NetCache_responseHeaderBuffer; + var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1767 var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1768 break; } - if (ClanChannel.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var13 = (long)(var10 + (var9 << 16)); - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - UrlRequester.field1301 = true; - if (var15 == null) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - UrlRequester.field1301 = false; + if (class131.NetCache_currentResponse == null) { // L: 1769 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1770 + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1771 + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1772 + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1773 + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1774 + long var13 = (long)(var10 + (var9 << 16)); // L: 1775 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1776 + class120.field1401 = true; // L: 1777 + if (var15 == null) { // L: 1778 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1779 + class120.field1401 = false; // L: 1780 } - if (var15 == null) { - throw new IOException(); + if (var15 == null) { // L: 1782 + throw new IOException(); // L: 1783 } - int var16 = var11 == 0 ? 5 : 9; - ClanChannel.NetCache_currentResponse = var15; - StudioGame.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + ClanChannel.NetCache_currentResponse.padding); - StudioGame.NetCache_responseArchiveBuffer.writeByte(var11); - StudioGame.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.field3726 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3726 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3726 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; + int var16 = var11 == 0 ? 5 : 9; // L: 1785 + class131.NetCache_currentResponse = var15; // L: 1786 + class138.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + class131.NetCache_currentResponse.padding); // L: 1787 + class138.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1788 + class138.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1789 + NetCache.field3707 = 8; // L: 1790 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1791 + } else if (NetCache.field3707 == 0) { // L: 1794 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1795 + NetCache.field3707 = 1; // L: 1796 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1797 } else { - ClanChannel.NetCache_currentResponse = null; + class131.NetCache_currentResponse = null; // L: 1801 } } } else { - var8 = StudioGame.NetCache_responseArchiveBuffer.array.length - ClanChannel.NetCache_currentResponse.padding; - var9 = 512 - NetCache.field3726; - if (var9 > var8 - StudioGame.NetCache_responseArchiveBuffer.offset) { - var9 = var8 - StudioGame.NetCache_responseArchiveBuffer.offset; + var8 = class138.NetCache_responseArchiveBuffer.array.length - class131.NetCache_currentResponse.padding; // L: 1807 + var9 = 512 - NetCache.field3707; // L: 1808 + if (var9 > var8 - class138.NetCache_responseArchiveBuffer.offset) { // L: 1809 + var9 = var8 - class138.NetCache_responseArchiveBuffer.offset; } - if (var9 > var18) { + if (var9 > var18) { // L: 1810 var9 = var18; } - NetCache.NetCache_socket.read(StudioGame.NetCache_responseArchiveBuffer.array, StudioGame.NetCache_responseArchiveBuffer.offset, var9); - if (NetCache.field3724 != 0) { - for (var10 = 0; var10 < var9; ++var10) { - var10000 = StudioGame.NetCache_responseArchiveBuffer.array; - var10001 = StudioGame.NetCache_responseArchiveBuffer.offset + var10; - var10000[var10001] ^= NetCache.field3724; + NetCache.NetCache_socket.read(class138.NetCache_responseArchiveBuffer.array, class138.NetCache_responseArchiveBuffer.offset, var9); // L: 1811 + if (NetCache.field3719 != 0) { // L: 1812 + for (var10 = 0; var10 < var9; ++var10) { // L: 1813 + var10000 = class138.NetCache_responseArchiveBuffer.array; + var10001 = class138.NetCache_responseArchiveBuffer.offset + var10; + var10000[var10001] ^= NetCache.field3719; } } - var25 = StudioGame.NetCache_responseArchiveBuffer; + var25 = class138.NetCache_responseArchiveBuffer; // L: 1815 var25.offset += var9; - NetCache.field3726 += var9; - if (var8 == StudioGame.NetCache_responseArchiveBuffer.offset) { - if (ClanChannel.NetCache_currentResponse.key == 16711935L) { - TriBool.NetCache_reference = StudioGame.NetCache_responseArchiveBuffer; + NetCache.field3707 += var9; // L: 1816 + if (var8 == class138.NetCache_responseArchiveBuffer.offset) { // L: 1817 + if (class131.NetCache_currentResponse.key == 16711935L) { // L: 1818 + class139.NetCache_reference = class138.NetCache_responseArchiveBuffer; // L: 1819 - for (var10 = 0; var10 < 256; ++var10) { - Archive var19 = NetCache.NetCache_archives[var10]; - if (var19 != null) { - TriBool.NetCache_reference.offset = var10 * 8 + 5; - var12 = TriBool.NetCache_reference.readInt(); - int var20 = TriBool.NetCache_reference.readInt(); - var19.loadIndex(var12, var20); + for (var10 = 0; var10 < 256; ++var10) { // L: 1820 + Archive var19 = NetCache.NetCache_archives[var10]; // L: 1821 + if (var19 != null) { // L: 1822 + class139.NetCache_reference.offset = var10 * 8 + 5; // L: 1823 + var12 = class139.NetCache_reference.readInt(); // L: 1824 + int var20 = class139.NetCache_reference.readInt(); // L: 1825 + var19.loadIndex(var12, var20); // L: 1826 } } } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(StudioGame.NetCache_responseArchiveBuffer.array, 0, var8); - var10 = (int)NetCache.NetCache_crc.getValue(); - if (var10 != ClanChannel.NetCache_currentResponse.crc) { + NetCache.NetCache_crc.reset(); // L: 1831 + NetCache.NetCache_crc.update(class138.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1832 + var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1833 + if (var10 != class131.NetCache_currentResponse.crc) { // L: 1834 try { - NetCache.NetCache_socket.close(); - } catch (Exception var23) { + NetCache.NetCache_socket.close(); // L: 1836 + } catch (Exception var23) { // L: 1838 } - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3724 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - var1 = false; - break label238; + ++NetCache.NetCache_crcMismatches; // L: 1839 + NetCache.NetCache_socket = null; // L: 1840 + NetCache.field3719 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1841 + var1 = false; // L: 1842 + break label245; } - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - ClanChannel.NetCache_currentResponse.archive.write((int)(ClanChannel.NetCache_currentResponse.key & 65535L), StudioGame.NetCache_responseArchiveBuffer.array, (ClanChannel.NetCache_currentResponse.key & 16711680L) == 16711680L, UrlRequester.field1301); + NetCache.NetCache_crcMismatches = 0; // L: 1845 + NetCache.NetCache_ioExceptions = 0; // L: 1846 + class131.NetCache_currentResponse.archive.write((int)(class131.NetCache_currentResponse.key & 65535L), class138.NetCache_responseArchiveBuffer.array, 16711680L == (class131.NetCache_currentResponse.key & 16711680L), class120.field1401); // L: 1847 } - ClanChannel.NetCache_currentResponse.remove(); - if (UrlRequester.field1301) { + class131.NetCache_currentResponse.remove(); // L: 1849 + if (class120.field1401) { // L: 1850 --NetCache.NetCache_pendingPriorityResponsesCount; } else { - --NetCache.NetCache_pendingResponsesCount; + --NetCache.NetCache_pendingResponsesCount; // L: 1851 } - NetCache.field3726 = 0; - ClanChannel.NetCache_currentResponse = null; - StudioGame.NetCache_responseArchiveBuffer = null; + NetCache.field3707 = 0; // L: 1852 + class131.NetCache_currentResponse = null; // L: 1853 + class138.NetCache_responseArchiveBuffer = null; // L: 1854 } else { - if (NetCache.field3726 != 512) { + if (NetCache.field3707 != 512) { // L: 1856 break; } - NetCache.field3726 = 0; + NetCache.field3707 = 0; } } } - var1 = true; + var1 = true; // L: 1860 } } catch (IOException var24) { try { - NetCache.NetCache_socket.close(); - } catch (Exception var22) { + NetCache.NetCache_socket.close(); // L: 1864 + } catch (Exception var22) { // L: 1866 } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - var1 = false; + ++NetCache.NetCache_ioExceptions; // L: 1867 + NetCache.NetCache_socket = null; // L: 1868 + var1 = false; // L: 1869 } } - if (!var1) { + if (!var1) { // L: 1873 this.doCycleJs5Connect(); } } - } + } // L: 1874 - @ObfuscatedName("ec") + @ObfuscatedName("fi") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2091398005" + garbageValue = "1173138453" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { - this.error("js5crc"); - UserList.updateGameState(1000); + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1877 + this.error("js5crc"); // L: 1878 + WorldMapData_1.updateGameState(1000); // L: 1879 } else { - if (NetCache.NetCache_ioExceptions >= 4) { - if (gameState <= 5) { - this.error("js5io"); - UserList.updateGameState(1000); - return; + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1882 + if (gameState <= 5) { // L: 1883 + this.error("js5io"); // L: 1884 + WorldMapData_1.updateGameState(1000); // L: 1885 + return; // L: 1886 } - field513 = 3000; - NetCache.NetCache_ioExceptions = 3; + field572 = 3000; // L: 1889 + NetCache.NetCache_ioExceptions = 3; // L: 1890 } - if (--field513 + 1 <= 0) { + if (--field572 + 1 <= 0) { // L: 1893 try { - if (js5ConnectState == 0) { - class19.js5SocketTask = GameEngine.taskHandler.newSocketTask(EnumComposition.worldHost, RouteStrategy.currentPort); - ++js5ConnectState; + if (js5ConnectState == 0) { // L: 1895 + class114.js5SocketTask = GameEngine.taskHandler.newSocketTask(WorldMapIcon_0.worldHost, ScriptEvent.currentPort); // L: 1896 + ++js5ConnectState; // L: 1897 } - if (js5ConnectState == 1) { - if (class19.js5SocketTask.status == 2) { - this.js5Error(-1); - return; + if (js5ConnectState == 1) { // L: 1899 + if (class114.js5SocketTask.status == 2) { // L: 1900 + this.js5Error(-1); // L: 1901 + return; // L: 1902 } - if (class19.js5SocketTask.status == 1) { + if (class114.js5SocketTask.status == 1) { // L: 1904 ++js5ConnectState; } } - if (js5ConnectState == 2) { - if (useBufferedSocket) { - Socket var2 = (Socket)class19.js5SocketTask.result; - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); - class78.js5Socket = var1; + if (js5ConnectState == 2) { // L: 1906 + if (useBufferedSocket) { // L: 1907 + ItemLayer.js5Socket = class132.method2767((Socket)class114.js5SocketTask.result, 40000, 5000); // L: 1908 } else { - class78.js5Socket = new NetSocket((Socket)class19.js5SocketTask.result, GameEngine.taskHandler, 5000); + ItemLayer.js5Socket = new NetSocket((Socket)class114.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1911 } - Buffer var5 = new Buffer(5); - var5.writeByte(15); - var5.writeInt(200); - class78.js5Socket.write(var5.array, 0, 5); - ++js5ConnectState; - class229.field2643 = UserComparator4.method2406(); + Buffer var1 = new Buffer(5); // L: 1913 + var1.writeByte(15); // L: 1914 + var1.writeInt(201); // L: 1915 + ItemLayer.js5Socket.write(var1.array, 0, 5); // L: 1916 + ++js5ConnectState; // L: 1917 + Login.field889 = class111.method2516(); // L: 1918 } - if (js5ConnectState == 3) { - if (class78.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var3 = class78.js5Socket.readUnsignedByte(); - if (var3 != 0) { - this.js5Error(var3); - return; + if (js5ConnectState == 3) { // L: 1920 + if (ItemLayer.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1921 + int var2 = ItemLayer.js5Socket.readUnsignedByte(); // L: 1922 + if (var2 != 0) { // L: 1923 + this.js5Error(var2); // L: 1924 + return; // L: 1925 } - ++js5ConnectState; - } else if (UserComparator4.method2406() - class229.field2643 > 30000L) { - this.js5Error(-2); - return; + ++js5ConnectState; // L: 1927 + } else if (class111.method2516() - Login.field889 > 30000L) { // L: 1930 + this.js5Error(-2); // L: 1931 + return; // L: 1932 } } - if (js5ConnectState == 4) { - class132.method2698(class78.js5Socket, gameState > 20); - class19.js5SocketTask = null; - class78.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; + if (js5ConnectState == 4) { // L: 1936 + GameObject.method4647(ItemLayer.js5Socket, gameState > 20); // L: 1937 + class114.js5SocketTask = null; // L: 1938 + ItemLayer.js5Socket = null; // L: 1939 + js5ConnectState = 0; // L: 1940 + js5Errors = 0; // L: 1941 } - } catch (IOException var4) { - this.js5Error(-3); + } catch (IOException var3) { // L: 1944 + this.js5Error(-3); // L: 1945 } } } - } + } // L: 1880 1947 - @ObfuscatedName("ei") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1846558213" + descriptor = "(IB)V", + garbageValue = "-88" ) @Export("js5Error") void js5Error(int var1) { - class19.js5SocketTask = null; - class78.js5Socket = null; - js5ConnectState = 0; - if (RouteStrategy.currentPort == WorldMapLabelSize.worldPort) { - RouteStrategy.currentPort = UserList.js5Port; + class114.js5SocketTask = null; // L: 1950 + ItemLayer.js5Socket = null; // L: 1951 + js5ConnectState = 0; // L: 1952 + if (ApproximateRouteStrategy.worldPort == ScriptEvent.currentPort) { // L: 1953 + ScriptEvent.currentPort = ParamComposition.js5Port; } else { - RouteStrategy.currentPort = WorldMapLabelSize.worldPort; + ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 1954 } - ++js5Errors; - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { - if (gameState <= 5) { - this.error("js5connect_full"); - UserList.updateGameState(1000); - } else { - field513 = 3000; - } - } else if (js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); - UserList.updateGameState(1000); - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - UserList.updateGameState(1000); - } else { - field513 = 3000; + ++js5Errors; // L: 1955 + if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1956 + if (js5Errors >= 2 && var1 == 6) { // L: 1963 + this.error("js5connect_outofdate"); // L: 1964 + WorldMapData_1.updateGameState(1000); // L: 1965 + } else if (js5Errors >= 4) { // L: 1967 + if (gameState <= 5) { // L: 1968 + this.error("js5connect"); // L: 1969 + WorldMapData_1.updateGameState(1000); // L: 1970 + } else { + field572 = 3000; // L: 1972 + } } + } else if (gameState <= 5) { // L: 1957 + this.error("js5connect_full"); // L: 1958 + WorldMapData_1.updateGameState(1000); // L: 1959 + } else { + field572 = 3000; // L: 1961 } - } + } // L: 1974 - @ObfuscatedName("ey") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "76" + descriptor = "(I)V", + garbageValue = "-1167591664" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); - PacketBuffer var2 = packetWriter.packetBuffer; + Object var1 = packetWriter.getSocket(); // L: 2424 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 2425 try { - if (loginState == 0) { - if (Tile.secureRandom == null && (secureRandomFuture.isDone() || field516 > 250)) { - Tile.secureRandom = secureRandomFuture.get(); - secureRandomFuture.shutdown(); - secureRandomFuture = null; + if (loginState == 0) { // L: 2427 + if (UserComparator4.secureRandom == null && (secureRandomFuture.isDone() || field496 > 250)) { // L: 2428 + UserComparator4.secureRandom = secureRandomFuture.get(); // L: 2429 + secureRandomFuture.shutdown(); // L: 2430 + secureRandomFuture = null; // L: 2431 } - if (Tile.secureRandom != null) { - if (var1 != null) { - ((AbstractSocket)var1).close(); - var1 = null; + if (UserComparator4.secureRandom != null) { // L: 2433 + if (var1 != null) { // L: 2434 + ((AbstractSocket)var1).close(); // L: 2435 + var1 = null; // L: 2436 } - UrlRequester.socketTask = null; - hadNetworkError = false; - field516 = 0; - if (field520.method7148()) { + PcmPlayer.socketTask = null; // L: 2438 + hadNetworkError = false; // L: 2439 + field496 = 0; // L: 2440 + if (field500.method7220()) { // L: 2441 try { - this.method1110(WorldMapSectionType.field2140); - CollisionMap.method3418(20); - } catch (Throwable var22) { - Timer.RunException_sendStackTrace((String)null, var22); - World.getLoginError(65); - return; + this.method1453(JagexCache.field1560); // L: 2443 + UserComparator6.method2503(20); // L: 2444 + } catch (Throwable var20) { // L: 2446 + MilliClock.RunException_sendStackTrace((String)null, var20); // L: 2447 + SecureRandomFuture.getLoginError(65); // L: 2448 + return; // L: 2449 } } else { - CollisionMap.method3418(1); + UserComparator6.method2503(1); // L: 2453 } } } - if (loginState == 20) { - if (!this.field523.method286()) { - return; + if (loginState == 20) { // L: 2457 + if (!this.field537.method280()) { // L: 2458 + return; // L: 2459 } - if (this.field523.method285()) { - Timer.RunException_sendStackTrace(this.field523.method295(), (Throwable)null); - World.getLoginError(65); - return; + if (this.field537.method276()) { // L: 2461 + MilliClock.RunException_sendStackTrace(this.field537.method293(), (Throwable)null); // L: 2462 + SecureRandomFuture.getLoginError(65); // L: 2463 + return; // L: 2464 } - class21 var3 = this.field523.method287(); - if (var3.method317() != 200) { - Timer.RunException_sendStackTrace("Response code: " + var3.method317() + "Response body: " + var3.method312(), (Throwable)null); - World.getLoginError(65); - return; + class21 var3 = this.field537.method281(); // L: 2466 + if (var3.method310() != 200) { // L: 2467 + MilliClock.RunException_sendStackTrace("Response code: " + var3.method310() + "Response body: " + var3.method303(), (Throwable)null); // L: 2468 + SecureRandomFuture.getLoginError(65); // L: 2469 + return; // L: 2470 } - field516 = 0; - this.field547 = var3.method312(); - CollisionMap.method3418(1); + field496 = 0; // L: 2472 + this.field501 = var3.method303(); // L: 2473 + UserComparator6.method2503(1); // L: 2474 } - if (loginState == 1) { - if (UrlRequester.socketTask == null) { - UrlRequester.socketTask = GameEngine.taskHandler.newSocketTask(EnumComposition.worldHost, RouteStrategy.currentPort); + if (loginState == 1) { // L: 2476 + if (PcmPlayer.socketTask == null) { // L: 2477 + PcmPlayer.socketTask = GameEngine.taskHandler.newSocketTask(WorldMapIcon_0.worldHost, ScriptEvent.currentPort); // L: 2478 } - if (UrlRequester.socketTask.status == 2) { + if (PcmPlayer.socketTask.status == 2) { // L: 2480 throw new IOException(); } - if (UrlRequester.socketTask.status == 1) { - if (useBufferedSocket) { - Socket var4 = (Socket)UrlRequester.socketTask.result; - BufferedNetSocket var25 = new BufferedNetSocket(var4, 40000, 5000); - var1 = var25; + if (PcmPlayer.socketTask.status == 1) { // L: 2481 + if (useBufferedSocket) { // L: 2482 + var1 = class132.method2767((Socket)PcmPlayer.socketTask.result, 40000, 5000); // L: 2483 } else { - var1 = new NetSocket((Socket)UrlRequester.socketTask.result, GameEngine.taskHandler, 5000); + var1 = new NetSocket((Socket)PcmPlayer.socketTask.result, GameEngine.taskHandler, 5000); // L: 2486 } - packetWriter.setSocket((AbstractSocket)var1); - UrlRequester.socketTask = null; - CollisionMap.method3418(2); + packetWriter.setSocket((AbstractSocket)var1); // L: 2488 + PcmPlayer.socketTask = null; // L: 2489 + UserComparator6.method2503(2); // L: 2490 } } - PacketBufferNode var28; - if (loginState == 2) { - packetWriter.clearBuffer(); - var28 = Tile.method4117(); - var28.clientPacket = null; - var28.clientPacketLength = 0; - var28.packetBuffer = new PacketBuffer(5000); - var28.packetBuffer.writeByte(LoginPacket.field2885.id); - packetWriter.addNode(var28); - packetWriter.flush(); - var2.offset = 0; - CollisionMap.method3418(3); + PacketBufferNode var4; + if (loginState == 2) { // L: 2493 + packetWriter.clearBuffer(); // L: 2494 + var4 = class92.method2296(); // L: 2497 + var4.clientPacket = null; // L: 2498 + var4.clientPacketLength = 0; // L: 2499 + var4.packetBuffer = new PacketBuffer(5000); // L: 2500 + var4.packetBuffer.writeByte(LoginPacket.field2901.id); // L: 2504 + packetWriter.addNode(var4); // L: 2505 + packetWriter.flush(); // L: 2506 + var2.offset = 0; // L: 2507 + UserComparator6.method2503(3); // L: 2508 } - boolean var14; - int var15; - if (loginState == 3) { - if (class126.pcmPlayer0 != null) { - class126.pcmPlayer0.method696(); + boolean var13; + int var14; + if (loginState == 3) { // L: 2510 + if (HealthBar.pcmPlayer0 != null) { // L: 2511 + HealthBar.pcmPlayer0.method750(); } - if (class116.pcmPlayer1 != null) { - class116.pcmPlayer1.method696(); + if (ScriptEvent.pcmPlayer1 != null) { // L: 2512 + ScriptEvent.pcmPlayer1.method750(); } - var14 = true; - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var14 = false; + var13 = true; // L: 2513 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2514 2515 + var13 = false; } - if (var14) { - var15 = ((AbstractSocket)var1).readUnsignedByte(); - if (class126.pcmPlayer0 != null) { - class126.pcmPlayer0.method696(); + if (var13) { // L: 2517 + var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2518 + if (HealthBar.pcmPlayer0 != null) { // L: 2519 + HealthBar.pcmPlayer0.method750(); } - if (class116.pcmPlayer1 != null) { - class116.pcmPlayer1.method696(); + if (ScriptEvent.pcmPlayer1 != null) { // L: 2520 + ScriptEvent.pcmPlayer1.method750(); } - if (var15 != 0) { - World.getLoginError(var15); - return; + if (var14 != 0) { // L: 2521 + SecureRandomFuture.getLoginError(var14); // L: 2522 + return; // L: 2523 } - var2.offset = 0; - CollisionMap.method3418(4); + var2.offset = 0; // L: 2525 + UserComparator6.method2503(4); // L: 2526 } } - int var40; - if (loginState == 4) { - if (var2.offset < 8) { - var40 = ((AbstractSocket)var1).available(); - if (var40 > 8 - var2.offset) { - var40 = 8 - var2.offset; + int var33; + if (loginState == 4) { // L: 2529 + if (var2.offset < 8) { // L: 2530 + var33 = ((AbstractSocket)var1).available(); // L: 2531 + if (var33 > 8 - var2.offset) { // L: 2532 + var33 = 8 - var2.offset; } - if (var40 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var40); - var2.offset += var40; + if (var33 > 0) { // L: 2533 + ((AbstractSocket)var1).read(var2.array, var2.offset, var33); // L: 2534 + var2.offset += var33; // L: 2535 } } - if (var2.offset == 8) { - var2.offset = 0; - Language.field3800 = var2.readLong(); - CollisionMap.method3418(5); + if (var2.offset == 8) { // L: 2538 + var2.offset = 0; // L: 2539 + ItemLayer.field2244 = var2.readLong(); // L: 2540 + UserComparator6.method2503(5); // L: 2541 } } - if (loginState == 5) { - packetWriter.packetBuffer.offset = 0; - packetWriter.clearBuffer(); - PacketBuffer var26 = new PacketBuffer(500); - int[] var30 = new int[]{Tile.secureRandom.nextInt(), Tile.secureRandom.nextInt(), Tile.secureRandom.nextInt(), Tile.secureRandom.nextInt()}; - var26.offset = 0; - var26.writeByte(1); - var26.writeInt(var30[0]); - var26.writeInt(var30[1]); - var26.writeInt(var30[2]); - var26.writeInt(var30[3]); - var26.writeLong(Language.field3800); - if (gameState == 40) { - var26.writeInt(class78.field1016[0]); - var26.writeInt(class78.field1016[1]); - var26.writeInt(class78.field1016[2]); - var26.writeInt(class78.field1016[3]); + if (loginState == 5) { // L: 2544 + packetWriter.packetBuffer.offset = 0; // L: 2545 + packetWriter.clearBuffer(); // L: 2546 + PacketBuffer var22 = new PacketBuffer(500); // L: 2547 + int[] var25 = new int[]{UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt()}; // L: 2548 2549 2550 2551 2552 + var22.offset = 0; // L: 2553 + var22.writeByte(1); // L: 2554 + var22.writeInt(var25[0]); // L: 2555 + var22.writeInt(var25[1]); // L: 2556 + var22.writeInt(var25[2]); // L: 2557 + var22.writeInt(var25[3]); // L: 2558 + var22.writeLong(ItemLayer.field2244); // L: 2559 + if (gameState == 40) { // L: 2560 + var22.writeInt(ServerPacket.field2893[0]); // L: 2561 + var22.writeInt(ServerPacket.field2893[1]); // L: 2562 + var22.writeInt(ServerPacket.field2893[2]); // L: 2563 + var22.writeInt(ServerPacket.field2893[3]); // L: 2564 } else { - var26.writeByte(field519.rsOrdinal()); - switch(field519.field1361) { + var22.writeByte(field693.rsOrdinal()); // L: 2567 + switch(field693.field1344) { // L: 2568 case 0: - var26.writeInt((Integer)WorldMapDecorationType.clientPreferences.parameters.get(SoundCache.method771(Login.Login_username))); - break; - case 1: - case 2: - var26.writeMedium(MouseHandler.field236); - ++var26.offset; - break; case 3: - var26.offset += 4; + var22.writeMedium(ReflectionCheck.field429); // L: 2577 + ++var22.offset; // L: 2578 + break; // L: 2579 + case 1: + var22.writeInt((Integer)class408.clientPreferences.parameters.get(ClanChannel.method2824(Login.Login_username))); // L: 2583 + break; + case 2: + var22.offset += 4; // L: 2571 } - if (field520.method7148()) { - var26.writeByte(class404.field4348.rsOrdinal()); - var26.writeStringCp1252NullTerminated(this.field547); + if (field500.method7220()) { // L: 2587 + var22.writeByte(class404.field4352.rsOrdinal()); // L: 2588 + var22.writeStringCp1252NullTerminated(this.field501); // L: 2589 } else { - var26.writeByte(class404.field4344.rsOrdinal()); - var26.writeStringCp1252NullTerminated(Login.Login_password); + var22.writeByte(class404.field4351.rsOrdinal()); // L: 2592 + var22.writeStringCp1252NullTerminated(Login.Login_password); // L: 2593 } } - var26.encryptRsa(class67.field864, class67.field866); - class78.field1016 = var30; - PacketBufferNode var6 = Tile.method4117(); - var6.clientPacket = null; - var6.clientPacketLength = 0; - var6.packetBuffer = new PacketBuffer(5000); - var6.packetBuffer.offset = 0; - if (gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.field2886.id); + var22.encryptRsa(class67.field840, class67.field843); // L: 2596 + ServerPacket.field2893 = var25; // L: 2597 + PacketBufferNode var6 = class92.method2296(); // L: 2600 + var6.clientPacket = null; // L: 2601 + var6.clientPacketLength = 0; // L: 2602 + var6.packetBuffer = new PacketBuffer(5000); // L: 2603 + var6.packetBuffer.offset = 0; // L: 2607 + if (gameState == 40) { // L: 2608 + var6.packetBuffer.writeByte(LoginPacket.field2894.id); // L: 2609 } else { - var6.packetBuffer.writeByte(LoginPacket.field2891.id); + var6.packetBuffer.writeByte(LoginPacket.field2896.id); // L: 2612 } - var6.packetBuffer.writeShort(0); - int var7 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(200); - var6.packetBuffer.writeInt(1); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeByte(field681); - var6.packetBuffer.writeBytes(var26.array, 0, var26.offset); - int var8 = var6.packetBuffer.offset; - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var6.packetBuffer.writeShort(Huffman.canvasWidth); - var6.packetBuffer.writeShort(MouseRecorder.canvasHeight); - PacketBuffer var9 = var6.packetBuffer; - int var12; - if (randomDatData != null) { - var9.writeBytes(randomDatData, 0, randomDatData.length); + var6.packetBuffer.writeShort(0); // L: 2614 + int var7 = var6.packetBuffer.offset; // L: 2615 + var6.packetBuffer.writeInt(201); // L: 2616 + var6.packetBuffer.writeInt(1); // L: 2617 + var6.packetBuffer.writeByte(clientType); // L: 2618 + var6.packetBuffer.writeByte(field469); // L: 2619 + var6.packetBuffer.writeBytes(var22.array, 0, var22.offset); // L: 2620 + int var8 = var6.packetBuffer.offset; // L: 2621 + var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2622 + var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2623 + var6.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2624 + var6.packetBuffer.writeShort(KeyHandler.canvasHeight); // L: 2625 + PacketBuffer var9 = var6.packetBuffer; // L: 2626 + if (randomDatData != null) { // L: 2628 + var9.writeBytes(randomDatData, 0, randomDatData.length); // L: 2629 } else { - byte[] var11 = new byte[24]; + byte[] var10 = ObjectSound.method1771(); // L: 2632 + var9.writeBytes(var10, 0, var10.length); // L: 2633 + } - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var11); + var6.packetBuffer.writeStringCp1252NullTerminated(UserComparator3.field1316); // L: 2635 + var6.packetBuffer.writeInt(TextureProvider.field2483); // L: 2636 + Buffer var32 = new Buffer(class54.platformInfo.size()); // L: 2637 + class54.platformInfo.write(var32); // L: 2638 + var6.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 2639 + var6.packetBuffer.writeByte(clientType); // L: 2640 + var6.packetBuffer.writeInt(0); // L: 2641 + var6.packetBuffer.method7010(Messages.archive6.hash); // L: 2642 + var6.packetBuffer.writeInt(Archive.archive15.hash); // L: 2643 + var6.packetBuffer.writeIntME(SecureRandomCallable.archive14.hash); // L: 2644 + var6.packetBuffer.method7126(HorizontalAlignment.archive7.hash); // L: 2645 + var6.packetBuffer.method7010(GrandExchangeOfferOwnWorldComparator.archive20.hash); // L: 2646 + var6.packetBuffer.writeIntME(Message.archive17.hash); // L: 2647 + var6.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.archive8.hash); // L: 2648 + var6.packetBuffer.method7010(Messages.archive18.hash); // L: 2649 + var6.packetBuffer.method7126(class1.archive2.hash); // L: 2650 + var6.packetBuffer.method7010(0); // L: 2651 + var6.packetBuffer.method7010(class14.archive12.hash); // L: 2652 + var6.packetBuffer.method7010(SecureRandomFuture.archive9.hash); // L: 2653 + var6.packetBuffer.writeInt(ApproximateRouteStrategy.archive1.hash); // L: 2654 + var6.packetBuffer.writeInt(InvDefinition.archive0.hash); // L: 2655 + var6.packetBuffer.method7010(ChatChannel.archive10.hash); // L: 2656 + var6.packetBuffer.writeInt(class11.archive5.hash); // L: 2657 + var6.packetBuffer.writeIntME(class111.archive19.hash); // L: 2658 + var6.packetBuffer.writeIntME(class12.archive4.hash); // L: 2659 + var6.packetBuffer.writeIntME(ParamComposition.archive3.hash); // L: 2660 + var6.packetBuffer.writeInt(LoginScreenAnimation.archive13.hash); // L: 2661 + var6.packetBuffer.writeInt(AbstractWorldMapIcon.archive11.hash); // L: 2662 + var6.packetBuffer.xteaEncrypt(var25, var8, var6.packetBuffer.offset); // L: 2663 + var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); // L: 2664 + packetWriter.addNode(var6); // L: 2665 + packetWriter.flush(); // L: 2666 + packetWriter.isaacCipher = new IsaacCipher(var25); // L: 2667 + int[] var11 = new int[4]; // L: 2668 - for (var12 = 0; var12 < 24 && var11[var12] == 0; ++var12) { - } + for (int var12 = 0; var12 < 4; ++var12) { // L: 2669 + var11[var12] = var25[var12] + 50; + } - if (var12 >= 24) { - throw new IOException(); - } - } catch (Exception var23) { - for (int var13 = 0; var13 < 24; ++var13) { - var11[var13] = -1; - } + var2.newIsaacCipher(var11); // L: 2670 + UserComparator6.method2503(6); // L: 2671 + } + + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2673 2674 + var33 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2675 + if (var33 == 21 && gameState == 20) { // L: 2676 + UserComparator6.method2503(12); // L: 2677 + } else if (var33 == 2) { // L: 2679 + UserComparator6.method2503(14); // L: 2680 + } else if (var33 == 15 && gameState == 40) { // L: 2682 + packetWriter.serverPacketLength = -1; // L: 2683 + UserComparator6.method2503(19); // L: 2684 + } else if (var33 == 64) { // L: 2686 + UserComparator6.method2503(10); // L: 2687 + } else if (var33 == 23 && field685 < 1) { // L: 2689 + ++field685; // L: 2690 + UserComparator6.method2503(0); // L: 2691 + } else if (var33 == 29) { // L: 2693 + UserComparator6.method2503(17); // L: 2694 + } else { + if (var33 != 69) { // L: 2696 + SecureRandomFuture.getLoginError(var33); // L: 2700 + return; // L: 2701 } - var9.writeBytes(var11, 0, var11.length); - } - - var6.packetBuffer.writeStringCp1252NullTerminated(ItemContainer.field1009); - var6.packetBuffer.writeInt(KeyHandler.field142); - Buffer var10 = new Buffer(MenuAction.platformInfo.size()); - MenuAction.platformInfo.write(var10); - var6.packetBuffer.writeBytes(var10.array, 0, var10.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeIntME(UserComparator8.archive10.hash); - var6.packetBuffer.writeInt(Tiles.archive6.hash); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeIntME(class54.archive20.hash); - var6.packetBuffer.method6940(RouteStrategy.archive2.hash); - var6.packetBuffer.method6942(ClanChannel.archive0.hash); - var6.packetBuffer.method6942(class150.archive3.hash); - var6.packetBuffer.writeIntME(class12.archive15.hash); - var6.packetBuffer.writeIntME(ItemContainer.archive17.hash); - var6.packetBuffer.writeIntME(Interpreter.archive9.hash); - var6.packetBuffer.writeInt(Skeleton.archive7.hash); - var6.packetBuffer.method6940(class260.archive4.hash); - var6.packetBuffer.writeIntME(ApproximateRouteStrategy.archive5.hash); - var6.packetBuffer.method6942(class176.archive8.hash); - var6.packetBuffer.method6940(UserComparator6.archive12.hash); - var6.packetBuffer.method6940(TextureProvider.archive18.hash); - var6.packetBuffer.method6940(class54.archive13.hash); - var6.packetBuffer.writeInt(MouseRecorder.archive1.hash); - var6.packetBuffer.writeIntME(ViewportMouse.archive19.hash); - var6.packetBuffer.writeIntME(class4.archive11.hash); - var6.packetBuffer.method6940(class28.archive14.hash); - var6.packetBuffer.xteaEncrypt(var30, var8, var6.packetBuffer.offset); - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); - packetWriter.addNode(var6); - packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var30); - int[] var39 = new int[4]; - - for (var12 = 0; var12 < 4; ++var12) { - var39[var12] = var30[var12] + 50; - } - - var2.newIsaacCipher(var39); - CollisionMap.method3418(6); - } - - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var40 = ((AbstractSocket)var1).readUnsignedByte(); - if (var40 == 21 && gameState == 20) { - CollisionMap.method3418(12); - } else if (var40 == 2) { - CollisionMap.method3418(14); - } else if (var40 == 15 && gameState == 40) { - packetWriter.serverPacketLength = -1; - CollisionMap.method3418(19); - } else if (var40 == 64) { - CollisionMap.method3418(10); - } else if (var40 == 23 && field680 < 1) { - ++field680; - CollisionMap.method3418(0); - } else if (var40 == 29) { - CollisionMap.method3418(17); - } else { - if (var40 != 69) { - World.getLoginError(var40); - return; - } - - CollisionMap.method3418(7); + UserComparator6.method2503(7); // L: 2697 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - class381.field4217 = var2.readUnsignedShort(); - CollisionMap.method3418(8); + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2705 2706 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2707 + var2.offset = 0; // L: 2708 + class320.field3868 = var2.readUnsignedShort(); // L: 2709 + UserComparator6.method2503(8); // L: 2710 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class381.field4217) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, class381.field4217); - class6[] var27 = new class6[]{class6.field17}; - class6 var31 = var27[var2.readUnsignedByte()]; + if (loginState == 8 && ((AbstractSocket)var1).available() >= class320.field3868) { // L: 2713 2714 + var2.offset = 0; // L: 2715 + ((AbstractSocket)var1).read(var2.array, var2.offset, class320.field3868); // L: 2716 + class6 var23 = class135.method2797()[var2.readUnsignedByte()]; // L: 2717 try { - class3 var5 = HorizontalAlignment.method3014(var31); - this.field528 = new class7(var2, var5); - CollisionMap.method3418(9); - } catch (Exception var21) { - World.getLoginError(22); - return; + switch(var23.field12) { // L: 2721 + case 0: + class0 var26 = new class0(); // L: 2728 + this.field507 = new class7(var2, var26); // L: 2734 + UserComparator6.method2503(9); // L: 2735 + break; + default: + throw new IllegalArgumentException(); // L: 2724 + } + } catch (Exception var19) { // L: 2737 + SecureRandomFuture.getLoginError(22); // L: 2738 + return; // L: 2739 } } - if (loginState == 9 && this.field528.method47()) { - this.field527 = this.field528.method49(); - this.field528.method48(); - this.field528 = null; - if (this.field527 == null) { - World.getLoginError(22); - return; + if (loginState == 9 && this.field507.method46()) { // L: 2743 2744 + this.field579 = this.field507.method48(); // L: 2745 + this.field507.method47(); // L: 2746 + this.field507 = null; // L: 2747 + if (this.field579 == null) { // L: 2748 + SecureRandomFuture.getLoginError(22); // L: 2749 + return; // L: 2750 } - packetWriter.clearBuffer(); - var28 = Tile.method4117(); - var28.clientPacket = null; - var28.clientPacketLength = 0; - var28.packetBuffer = new PacketBuffer(5000); - var28.packetBuffer.writeByte(LoginPacket.field2888.id); - var28.packetBuffer.writeShort(this.field527.offset); - var28.packetBuffer.method6890(this.field527); - packetWriter.addNode(var28); - packetWriter.flush(); - this.field527 = null; - CollisionMap.method3418(6); + packetWriter.clearBuffer(); // L: 2752 + var4 = class92.method2296(); // L: 2755 + var4.clientPacket = null; // L: 2756 + var4.clientPacketLength = 0; // L: 2757 + var4.packetBuffer = new PacketBuffer(5000); // L: 2758 + var4.packetBuffer.writeByte(LoginPacket.field2900.id); // L: 2762 + var4.packetBuffer.writeShort(this.field579.offset); // L: 2763 + var4.packetBuffer.method6960(this.field579); // L: 2764 + packetWriter.addNode(var4); // L: 2765 + packetWriter.flush(); // L: 2766 + this.field579 = null; // L: 2767 + UserComparator6.method2503(6); // L: 2768 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - ModeWhere.field3818 = ((AbstractSocket)var1).readUnsignedByte(); - CollisionMap.method3418(11); + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2771 2772 + VarbitComposition.field1775 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2773 + UserComparator6.method2503(11); // L: 2774 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= ModeWhere.field3818) { - ((AbstractSocket)var1).read(var2.array, 0, ModeWhere.field3818); - var2.offset = 0; - CollisionMap.method3418(6); + if (loginState == 11 && ((AbstractSocket)var1).available() >= VarbitComposition.field1775) { // L: 2777 2778 + ((AbstractSocket)var1).read(var2.array, 0, VarbitComposition.field1775); // L: 2779 + var2.offset = 0; // L: 2780 + UserComparator6.method2503(6); // L: 2781 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field539 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - CollisionMap.method3418(13); + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2784 2785 + field498 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2786 + UserComparator6.method2503(13); // L: 2787 } - if (loginState == 13) { - field516 = 0; - class17.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field539 / 60 + " seconds."); - if (--field539 <= 0) { - CollisionMap.method3418(0); + if (loginState == 13) { // L: 2790 + field496 = 0; // L: 2791 + class1.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field498 / 60 + " seconds."); // L: 2792 + if (--field498 <= 0) { // L: 2793 + UserComparator6.method2503(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - WorldMapLabel.field2176 = ((AbstractSocket)var1).readUnsignedByte(); - CollisionMap.method3418(15); + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2796 2797 + TextureProvider.field2485 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2798 + UserComparator6.method2503(15); // L: 2799 } - int var17; - boolean var41; - if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapLabel.field2176) { - var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; - ((AbstractSocket)var1).read(var2.array, 0, 4); - var2.offset = 0; - var41 = false; - if (var14) { - var15 = var2.readByteIsaac() << 24; - var15 |= var2.readByteIsaac() << 16; - var15 |= var2.readByteIsaac() << 8; - var15 |= var2.readByteIsaac(); - var17 = SoundCache.method771(Login.Login_username); - if (WorldMapDecorationType.clientPreferences.parameters.size() >= 10 && !WorldMapDecorationType.clientPreferences.parameters.containsKey(var17)) { - Iterator var38 = WorldMapDecorationType.clientPreferences.parameters.entrySet().iterator(); - var38.next(); - var38.remove(); + int var15; + boolean var34; + if (loginState == 15 && ((AbstractSocket)var1).available() >= TextureProvider.field2485) { // L: 2802 2803 + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2804 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2805 + var2.offset = 0; // L: 2806 + var34 = false; // L: 2807 + if (var13) { // L: 2808 + var14 = var2.readByteIsaac() << 24; // L: 2809 + var14 |= var2.readByteIsaac() << 16; // L: 2810 + var14 |= var2.readByteIsaac() << 8; // L: 2811 + var14 |= var2.readByteIsaac(); // L: 2812 + var15 = ClanChannel.method2824(Login.Login_username); // L: 2813 + if (class408.clientPreferences.parameters.size() >= 10 && !class408.clientPreferences.parameters.containsKey(var15)) { // L: 2814 2815 + Iterator var31 = class408.clientPreferences.parameters.entrySet().iterator(); // L: 2816 + var31.next(); // L: 2817 + var31.remove(); // L: 2818 } - WorldMapDecorationType.clientPreferences.parameters.put(var17, var15); + class408.clientPreferences.parameters.put(var15, var14); // L: 2821 } - if (Login_isUsernameRemembered) { - WorldMapDecorationType.clientPreferences.rememberedUsername = Login.Login_username; + if (Login_isUsernameRemembered) { // L: 2823 + class408.clientPreferences.rememberedUsername = Login.Login_username; // L: 2824 } else { - WorldMapDecorationType.clientPreferences.rememberedUsername = null; + class408.clientPreferences.rememberedUsername = null; // L: 2827 } - ScriptFrame.savePreferences(); - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); - localPlayerIndex <<= 8; - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field630 = ((AbstractSocket)var1).readUnsignedByte(); - ((AbstractSocket)var1).read(var2.array, 0, 1); - var2.offset = 0; - ServerPacket[] var33 = WallDecoration.ServerPacket_values(); - int var18 = var2.readSmartByteShortIsaac(); - if (var18 < 0 || var18 >= var33.length) { - throw new IOException(var18 + " " + var2.offset); + Login.savePreferences(); // L: 2829 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2830 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2831 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2832 + localPlayerIndex <<= 8; // L: 2833 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2834 + field588 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2835 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2836 + var2.offset = 0; // L: 2837 + ServerPacket[] var5 = class128.ServerPacket_values(); // L: 2838 + int var16 = var2.readSmartByteShortIsaac(); // L: 2839 + if (var16 < 0 || var16 >= var5.length) { // L: 2840 + throw new IOException(var16 + " " + var2.offset); } - packetWriter.serverPacket = var33[var18]; - packetWriter.serverPacketLength = packetWriter.serverPacket.length; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + packetWriter.serverPacket = var5[var16]; // L: 2841 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2842 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2843 + var2.offset = 0; // L: 2844 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2845 try { - Client var19 = class21.client; - JSObject.getWindow(var19).call("zap", (Object[])null); - } catch (Throwable var20) { + Client var17 = ArchiveLoader.client; // L: 2847 + JSObject.getWindow(var17).call("zap", (Object[])null); // L: 2850 + } catch (Throwable var18) { // L: 2853 } - CollisionMap.method3418(16); + UserComparator6.method2503(16); // L: 2854 } - if (loginState != 16) { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - class113.field1364 = var2.readUnsignedShort(); - CollisionMap.method3418(18); + if (loginState != 16) { // L: 2857 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2976 2977 + var2.offset = 0; // L: 2978 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2979 + var2.offset = 0; // L: 2980 + class122.field1420 = var2.readUnsignedShort(); // L: 2981 + UserComparator6.method2503(18); // L: 2982 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class113.field1364) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, class113.field1364); - var2.offset = 0; - String var34 = var2.readStringCp1252NullTerminated(); - String var37 = var2.readStringCp1252NullTerminated(); - String var35 = var2.readStringCp1252NullTerminated(); - class17.setLoginResponseString(var34, var37, var35); - UserList.updateGameState(10); + if (loginState == 18 && ((AbstractSocket)var1).available() >= class122.field1420) { // L: 2985 2986 + var2.offset = 0; // L: 2987 + ((AbstractSocket)var1).read(var2.array, 0, class122.field1420); // L: 2988 + var2.offset = 0; // L: 2989 + String var27 = var2.readStringCp1252NullTerminated(); // L: 2990 + String var30 = var2.readStringCp1252NullTerminated(); // L: 2991 + String var28 = var2.readStringCp1252NullTerminated(); // L: 2992 + class1.setLoginResponseString(var27, var30, var28); // L: 2993 + WorldMapData_1.updateGameState(10); // L: 2994 } - if (loginState == 19) { - if (packetWriter.serverPacketLength == -1) { - if (((AbstractSocket)var1).available() < 2) { + if (loginState == 19) { // L: 2997 + if (packetWriter.serverPacketLength == -1) { // L: 2998 + if (((AbstractSocket)var1).available() < 2) { // L: 2999 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3000 + var2.offset = 0; // L: 3001 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3002 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - var2.offset = 0; - var40 = packetWriter.serverPacketLength; - timer.method5908(); - NPC.method2235(); - ArchiveDiskActionHandler.updatePlayer(var2); - if (var40 != var2.offset) { - throw new RuntimeException(); + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3004 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3005 + var2.offset = 0; // L: 3006 + var33 = packetWriter.serverPacketLength; // L: 3007 + timer.method5970(); // L: 3008 + Bounds.method6370(); // L: 3009 + LoginScreenAnimation.updatePlayer(var2); // L: 3010 + if (var33 != var2.offset) { // L: 3011 + throw new RuntimeException(); // L: 3012 } } } else { - ++field516; - if (field516 > 2000) { - if (field680 < 1) { - if (WorldMapLabelSize.worldPort == RouteStrategy.currentPort) { - RouteStrategy.currentPort = UserList.js5Port; + ++field496; // L: 3016 + if (field496 > 2000) { // L: 3017 + if (field685 < 1) { // L: 3018 + if (ScriptEvent.currentPort == ApproximateRouteStrategy.worldPort) { // L: 3019 + ScriptEvent.currentPort = ParamComposition.js5Port; } else { - RouteStrategy.currentPort = WorldMapLabelSize.worldPort; + ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 3020 } - ++field680; - CollisionMap.method3418(0); + ++field685; // L: 3021 + UserComparator6.method2503(0); // L: 3022 } else { - World.getLoginError(-3); + SecureRandomFuture.getLoginError(-3); // L: 3025 } } } } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5906(); - mouseLastLastPressedTimeMillis = -1L; - ClientPreferences.mouseRecorder.index = 0; - KitDefinition.hasFocus = true; - hadFocus = true; - field719 = -1L; - class6.method45(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1281 = null; - packetWriter.field1293 = null; - packetWriter.field1288 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1290 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - class7.method46(); - class130.method2677(0); - class1.method13(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - Widget.field3165 = null; - minimapState = 0; - field722 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - Players.Players_count = 0; + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2858 + var2.offset = 0; // L: 2859 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2860 + timer.method5974(); // L: 2861 + mouseLastLastPressedTimeMillis = -1L; // L: 2864 + Interpreter.mouseRecorder.index = 0; // L: 2865 + WorldMapSectionType.hasFocus = true; // L: 2866 + hadFocus = true; // L: 2867 + field565 = -1L; // L: 2868 + class125.method2637(); // L: 2869 + packetWriter.clearBuffer(); // L: 2870 + packetWriter.packetBuffer.offset = 0; // L: 2871 + packetWriter.serverPacket = null; // L: 2872 + packetWriter.field1277 = null; // L: 2873 + packetWriter.field1284 = null; // L: 2874 + packetWriter.field1285 = null; // L: 2875 + packetWriter.serverPacketLength = 0; // L: 2876 + packetWriter.field1275 = 0; // L: 2877 + rebootTimer = 0; // L: 2878 + logoutTimer = 0; // L: 2879 + hintArrowType = 0; // L: 2880 + KeyHandler.method343(); // L: 2881 + ClanSettings.method2703(0); // L: 2882 + Strings.method5220(); // L: 2883 + isItemSelected = 0; // L: 2884 + isSpellSelected = false; // L: 2885 + soundEffectCount = 0; // L: 2886 + camAngleY = 0; // L: 2887 + oculusOrbState = 0; // L: 2888 + ClanSettings.field1440 = null; // L: 2889 + minimapState = 0; // L: 2890 + field701 = -1; // L: 2891 + destinationX = 0; // L: 2892 + destinationY = 0; // L: 2893 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 2894 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 2895 + npcCount = 0; // L: 2896 + Players.Players_count = 0; // L: 2898 - for (var40 = 0; var40 < 2048; ++var40) { - Players.field1248[var40] = null; - Players.field1245[var40] = 1; + for (var33 = 0; var33 < 2048; ++var33) { // L: 2899 + Players.field1242[var33] = null; // L: 2900 + Players.field1241[var33] = 1; // L: 2901 } - for (var40 = 0; var40 < 2048; ++var40) { - players[var40] = null; + for (var33 = 0; var33 < 2048; ++var33) { // L: 2904 + players[var33] = null; } - for (var40 = 0; var40 < 32768; ++var40) { - npcs[var40] = null; + for (var33 = 0; var33 < 32768; ++var33) { // L: 2905 + npcs[var33] = null; } - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); + combatTargetPlayerIndex = -1; // L: 2906 + projectiles.clear(); // L: 2907 + graphicsObjects.clear(); // L: 2908 - for (var40 = 0; var40 < 4; ++var40) { - for (var15 = 0; var15 < 104; ++var15) { - for (var17 = 0; var17 < 104; ++var17) { - groundItems[var40][var15][var17] = null; + for (var33 = 0; var33 < 4; ++var33) { // L: 2909 + for (var14 = 0; var14 < 104; ++var14) { // L: 2910 + for (var15 = 0; var15 < 104; ++var15) { // L: 2911 + groundItems[var33][var14][var15] = null; // L: 2912 } } } - pendingSpawns = new NodeDeque(); - Message.friendSystem.clear(); + pendingSpawns = new NodeDeque(); // L: 2916 + class112.friendSystem.clear(); // L: 2917 - for (var40 = 0; var40 < VarpDefinition.VarpDefinition_fileCount; ++var40) { - VarpDefinition var36 = ApproximateRouteStrategy.VarpDefinition_get(var40); - if (var36 != null) { - Varps.Varps_temp[var40] = 0; - Varps.Varps_main[var40] = 0; + for (var33 = 0; var33 < VarpDefinition.VarpDefinition_fileCount; ++var33) { // L: 2918 + VarpDefinition var29 = ArchiveLoader.VarpDefinition_get(var33); // L: 2919 + if (var29 != null) { // L: 2920 + Varps.Varps_temp[var33] = 0; // L: 2921 + Varps.Varps_main[var33] = 0; // L: 2922 } } - Tile.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - var40 = rootInterface; - if (var40 != -1 && class157.Widget_loadedInterfaces[var40]) { - Widget.Widget_archive.clearFilesGroup(var40); - if (Widget.Widget_interfaceComponents[var40] != null) { - var41 = true; + Message.varcs.clearTransient(); // L: 2925 + followerIndex = -1; // L: 2926 + if (rootInterface != -1) { // L: 2927 + var33 = rootInterface; // L: 2928 + if (var33 != -1 && class132.Widget_loadedInterfaces[var33]) { // L: 2930 2931 + class283.Widget_archive.clearFilesGroup(var33); // L: 2932 + if (WorldMapSection1.Widget_interfaceComponents[var33] != null) { // L: 2933 + var34 = true; // L: 2934 - for (var17 = 0; var17 < Widget.Widget_interfaceComponents[var40].length; ++var17) { - if (Widget.Widget_interfaceComponents[var40][var17] != null) { - if (Widget.Widget_interfaceComponents[var40][var17].type != 2) { - Widget.Widget_interfaceComponents[var40][var17] = null; + for (var15 = 0; var15 < WorldMapSection1.Widget_interfaceComponents[var33].length; ++var15) { // L: 2935 + if (WorldMapSection1.Widget_interfaceComponents[var33][var15] != null) { // L: 2936 + if (WorldMapSection1.Widget_interfaceComponents[var33][var15].type != 2) { // L: 2937 + WorldMapSection1.Widget_interfaceComponents[var33][var15] = null; } else { - var41 = false; + var34 = false; // L: 2938 } } } - if (var41) { - Widget.Widget_interfaceComponents[var40] = null; + if (var34) { // L: 2941 + WorldMapSection1.Widget_interfaceComponents[var33] = null; } - class157.Widget_loadedInterfaces[var40] = false; + class132.Widget_loadedInterfaces[var33] = false; // L: 2942 } } } - for (InterfaceParent var29 = (InterfaceParent)interfaceParents.first(); var29 != null; var29 = (InterfaceParent)interfaceParents.next()) { - WorldMapLabelSize.closeInterface(var29, true); + for (InterfaceParent var24 = (InterfaceParent)interfaceParents.first(); var24 != null; var24 = (InterfaceParent)interfaceParents.next()) { // L: 2945 + Players.closeInterface(var24, true); // L: 2946 } - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - menuOptionsCount = 0; - isMenuOpen = false; - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + rootInterface = -1; // L: 2948 + interfaceParents = new NodeHashTable(8); // L: 2949 + meslayerContinueWidget = null; // L: 2950 + KeyHandler.method343(); // L: 2951 + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2952 - for (var40 = 0; var40 < 8; ++var40) { - playerMenuActions[var40] = null; - playerOptionsPriorities[var40] = false; + for (var33 = 0; var33 < 8; ++var33) { // L: 2953 + playerMenuActions[var33] = null; // L: 2954 + playerOptionsPriorities[var33] = false; // L: 2955 } - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; + GrandExchangeOfferUnitPriceComparator.method5485(); // L: 2957 + isLoading = true; // L: 2958 - for (var40 = 0; var40 < 100; ++var40) { - field710[var40] = true; + for (var33 = 0; var33 < 100; ++var33) { // L: 2959 + field594[var33] = true; } - PacketBufferNode var32 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2718, packetWriter.isaacCipher); - var32.packetBuffer.writeByte(class12.getWindowedMode()); - var32.packetBuffer.writeShort(Huffman.canvasWidth); - var32.packetBuffer.writeShort(MouseRecorder.canvasHeight); - packetWriter.addNode(var32); - class264.friendsChat = null; - class114.guestClanSettings = null; - Arrays.fill(currentClanSettings, (Object)null); - GrandExchangeOfferNameComparator.guestClanChannel = null; - Arrays.fill(currentClanChannels, (Object)null); + Frames.method4481(); // L: 2960 + AbstractArchive.friendsChat = null; // L: 2961 + class67.guestClanSettings = null; // L: 2962 + Arrays.fill(currentClanSettings, (Object)null); // L: 2963 + class115.guestClanChannel = null; // L: 2964 + Arrays.fill(currentClanChannels, (Object)null); // L: 2965 - for (var40 = 0; var40 < 8; ++var40) { - grandExchangeOffers[var40] = new GrandExchangeOffer(); + for (var33 = 0; var33 < 8; ++var33) { // L: 2966 + grandExchangeOffers[var33] = new GrandExchangeOffer(); } - class6.grandExchangeEvents = null; - ArchiveDiskActionHandler.updatePlayer(var2); - HealthBarDefinition.field1671 = -1; - WorldMapArea.loadRegions(false, var2); - packetWriter.serverPacket = null; + JagexCache.grandExchangeEvents = null; // L: 2967 + LoginScreenAnimation.updatePlayer(var2); // L: 2969 + ItemLayer.field2243 = -1; // L: 2970 + Canvas.loadRegions(false, var2); // L: 2971 + packetWriter.serverPacket = null; // L: 2972 } } } - } catch (IOException var24) { - if (field680 < 1) { - if (RouteStrategy.currentPort == WorldMapLabelSize.worldPort) { - RouteStrategy.currentPort = UserList.js5Port; + } catch (IOException var21) { // L: 3029 + if (field685 < 1) { // L: 3030 + if (ApproximateRouteStrategy.worldPort == ScriptEvent.currentPort) { // L: 3031 + ScriptEvent.currentPort = ParamComposition.js5Port; } else { - RouteStrategy.currentPort = WorldMapLabelSize.worldPort; + ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 3032 } - ++field680; - CollisionMap.method3418(0); + ++field685; // L: 3033 + UserComparator6.method2503(0); // L: 3034 } else { - World.getLoginError(-2); + SecureRandomFuture.getLoginError(-2); // L: 3037 } } - } + } // L: 2794 2974 3014 3023 3026 3035 3038 3040 - @ObfuscatedName("fp") + @ObfuscatedName("fc") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1935915349" + garbageValue = "-681213511" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { + if (rebootTimer > 1) { // L: 3295 --rebootTimer; } - if (logoutTimer > 0) { + if (logoutTimer > 0) { // L: 3296 --logoutTimer; } - if (hadNetworkError) { - hadNetworkError = false; - class20.method302(); + if (hadNetworkError) { // L: 3297 + hadNetworkError = false; // L: 3298 + Clock.method2960(); // L: 3299 } else { - if (!isMenuOpen) { - class174.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 3302 + FriendSystem.addCancelMenuEntry(); } - for (int var1 = 0; var1 < 100 && this.method1307(packetWriter); ++var1) { + int var1; + for (var1 = 0; var1 < 100 && this.method1180(packetWriter); ++var1) { // L: 3303 3304 } - if (gameState == 30) { + if (gameState == 30) { // L: 3306 while (true) { - ReflectionCheck var2 = (ReflectionCheck)class54.reflectionChecks.last(); - boolean var31; - if (var2 == null) { - var31 = false; + ReflectionCheck var2 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 3310 + boolean var32; + if (var2 == null) { // L: 3311 + var32 = false; // L: 3312 } else { - var31 = true; + var32 = true; // L: 3315 } int var3; - PacketBufferNode var32; - if (!var31) { - PacketBufferNode var15; - int var16; - if (timer.field3905) { - var15 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2724, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var16 = var15.packetBuffer.offset; - timer.write(var15.packetBuffer); - var15.packetBuffer.method6918(var15.packetBuffer.offset - var16); - packetWriter.addNode(var15); - timer.method5907(); + PacketBufferNode var33; + if (!var32) { // L: 3317 + PacketBufferNode var14; + int var15; + if (timer.field3900) { // L: 3325 + var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2666, packetWriter.isaacCipher); // L: 3327 + var14.packetBuffer.writeByte(0); // L: 3328 + var15 = var14.packetBuffer.offset; // L: 3329 + timer.write(var14.packetBuffer); // L: 3330 + var14.packetBuffer.method6963(var14.packetBuffer.offset - var15); // L: 3331 + packetWriter.addNode(var14); // L: 3332 + timer.method5975(); // L: 3333 } int var4; @@ -3132,2842 +3946,2856 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { int var10; int var11; int var12; - synchronized(ClientPreferences.mouseRecorder.lock) { - if (!field684) { - ClientPreferences.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || ClientPreferences.mouseRecorder.index >= 40) { - var32 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + PacketBuffer var10000; + synchronized(Interpreter.mouseRecorder.lock) { // L: 3336 + if (!field497) { // L: 3337 + Interpreter.mouseRecorder.index = 0; // L: 3423 + } else if (MouseHandler.MouseHandler_lastButton != 0 || Interpreter.mouseRecorder.index >= 40) { // L: 3338 + var33 = null; // L: 3340 + var3 = 0; // L: 3341 + var4 = 0; // L: 3342 + var5 = 0; // L: 3343 + var6 = 0; // L: 3344 - for (var7 = 0; var7 < ClientPreferences.mouseRecorder.index && (var32 == null || var32.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = ClientPreferences.mouseRecorder.ys[var7]; - if (var8 < -1) { + for (var7 = 0; var7 < Interpreter.mouseRecorder.index && (var33 == null || var33.packetBuffer.offset - var3 < 246); ++var7) { // L: 3345 3346 + var4 = var7; // L: 3347 + var8 = Interpreter.mouseRecorder.ys[var7]; // L: 3348 + if (var8 < -1) { // L: 3349 var8 = -1; - } else if (var8 > 65534) { + } else if (var8 > 65534) { // L: 3350 var8 = 65534; } - var9 = ClientPreferences.mouseRecorder.xs[var7]; - if (var9 < -1) { + var9 = Interpreter.mouseRecorder.xs[var7]; // L: 3351 + if (var9 < -1) { // L: 3352 var9 = -1; - } else if (var9 > 65534) { + } else if (var9 > 65534) { // L: 3353 var9 = 65534; } - if (var9 != field495 || var8 != field496) { - if (var32 == null) { - var32 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2686, packetWriter.isaacCipher); - var32.packetBuffer.writeByte(0); - var3 = var32.packetBuffer.offset; - PacketBuffer var10000 = var32.packetBuffer; + if (var9 != field475 || var8 != field476) { // L: 3354 + if (var33 == null) { // L: 3357 + var33 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2704, packetWriter.isaacCipher); // L: 3358 + var33.packetBuffer.writeByte(0); // L: 3359 + var3 = var33.packetBuffer.offset; // L: 3360 + var10000 = var33.packetBuffer; // L: 3361 var10000.offset += 2; - var5 = 0; - var6 = 0; + var5 = 0; // L: 3362 + var6 = 0; // L: 3363 } - if (-1L != field650) { - var10 = var9 - field495; - var11 = var8 - field496; - var12 = (int)((ClientPreferences.mouseRecorder.millis[var7] - field650) / 20L); - var5 = (int)((long)var5 + (ClientPreferences.mouseRecorder.millis[var7] - field650) % 20L); + if (field477 != -1L) { // L: 3368 + var10 = var9 - field475; // L: 3369 + var11 = var8 - field476; // L: 3370 + var12 = (int)((Interpreter.mouseRecorder.millis[var7] - field477) / 20L); // L: 3371 + var5 = (int)((long)var5 + (Interpreter.mouseRecorder.millis[var7] - field477) % 20L); // L: 3372 } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; + var10 = var9; // L: 3375 + var11 = var8; // L: 3376 + var12 = Integer.MAX_VALUE; // L: 3377 } - field495 = var9; - field496 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var32.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var32.packetBuffer.writeByte(var12 + 128); - var32.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var32.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var32.packetBuffer.writeInt(var9 | var8 << 16); + field475 = var9; // L: 3379 + field476 = var8; // L: 3380 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3381 + var10 += 32; // L: 3382 + var11 += 32; // L: 3383 + var33.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3384 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3386 + var10 += 128; // L: 3387 + var11 += 128; // L: 3388 + var33.packetBuffer.writeByte(var12 + 128); // L: 3389 + var33.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3390 + } else if (var12 < 32) { // L: 3392 + var33.packetBuffer.writeByte(var12 + 192); // L: 3393 + if (var9 != -1 && var8 != -1) { // L: 3394 + var33.packetBuffer.writeInt(var9 | var8 << 16); // L: 3395 } else { - var32.packetBuffer.writeInt(Integer.MIN_VALUE); + var33.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var32.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var32.packetBuffer.writeInt(var9 | var8 << 16); + var33.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3398 + if (var9 != -1 && var8 != -1) { // L: 3399 + var33.packetBuffer.writeInt(var9 | var8 << 16); // L: 3400 } else { - var32.packetBuffer.writeInt(Integer.MIN_VALUE); + var33.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; - field650 = ClientPreferences.mouseRecorder.millis[var7]; + ++var6; // L: 3402 + field477 = Interpreter.mouseRecorder.millis[var7]; // L: 3403 } } - if (var32 != null) { - var32.packetBuffer.method6918(var32.packetBuffer.offset - var3); - var7 = var32.packetBuffer.offset; - var32.packetBuffer.offset = var3; - var32.packetBuffer.writeByte(var5 / var6); - var32.packetBuffer.writeByte(var5 % var6); - var32.packetBuffer.offset = var7; - packetWriter.addNode(var32); + if (var33 != null) { // L: 3405 + var33.packetBuffer.method6963(var33.packetBuffer.offset - var3); // L: 3406 + var7 = var33.packetBuffer.offset; // L: 3407 + var33.packetBuffer.offset = var3; // L: 3408 + var33.packetBuffer.writeByte(var5 / var6); // L: 3409 + var33.packetBuffer.writeByte(var5 % var6); // L: 3410 + var33.packetBuffer.offset = var7; // L: 3411 + packetWriter.addNode(var33); // L: 3412 } - if (var4 >= ClientPreferences.mouseRecorder.index) { - ClientPreferences.mouseRecorder.index = 0; + if (var4 >= Interpreter.mouseRecorder.index) { // L: 3414 + Interpreter.mouseRecorder.index = 0; } else { - MouseRecorder var44 = ClientPreferences.mouseRecorder; - var44.index -= var4; - System.arraycopy(ClientPreferences.mouseRecorder.xs, var4, ClientPreferences.mouseRecorder.xs, 0, ClientPreferences.mouseRecorder.index); - System.arraycopy(ClientPreferences.mouseRecorder.ys, var4, ClientPreferences.mouseRecorder.ys, 0, ClientPreferences.mouseRecorder.index); - System.arraycopy(ClientPreferences.mouseRecorder.millis, var4, ClientPreferences.mouseRecorder.millis, 0, ClientPreferences.mouseRecorder.index); + MouseRecorder var55 = Interpreter.mouseRecorder; // L: 3416 + var55.index -= var4; + System.arraycopy(Interpreter.mouseRecorder.xs, var4, Interpreter.mouseRecorder.xs, 0, Interpreter.mouseRecorder.index); // L: 3417 + System.arraycopy(Interpreter.mouseRecorder.ys, var4, Interpreter.mouseRecorder.ys, 0, Interpreter.mouseRecorder.index); // L: 3418 + System.arraycopy(Interpreter.mouseRecorder.millis, var4, Interpreter.mouseRecorder.millis, 0, Interpreter.mouseRecorder.index); // L: 3419 } } } - PacketBufferNode var19; - if (MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var17 > 32767L) { - var17 = 32767L; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3425 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3426 + if (var16 > 32767L) { // L: 3427 + var16 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3428 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3429 + if (var3 < 0) { // L: 3430 var3 = 0; - } else if (var3 > MouseRecorder.canvasHeight) { - var3 = MouseRecorder.canvasHeight; + } else if (var3 > KeyHandler.canvasHeight) { // L: 3431 + var3 = KeyHandler.canvasHeight; } - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3432 + if (var4 < 0) { // L: 3433 var4 = 0; - } else if (var4 > Huffman.canvasWidth) { - var4 = Huffman.canvasWidth; + } else if (var4 > GameEngine.canvasWidth) { // L: 3434 + var4 = GameEngine.canvasWidth; } - var5 = (int)var17; - var19 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2710, packetWriter.isaacCipher); - var19.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); - var19.packetBuffer.writeShort(var4); - var19.packetBuffer.writeShort(var3); - packetWriter.addNode(var19); + var5 = (int)var16; // L: 3435 + var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2725, packetWriter.isaacCipher); // L: 3436 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3437 + var18.packetBuffer.writeShort(var4); // L: 3438 + var18.packetBuffer.writeShort(var3); // L: 3439 + packetWriter.addNode(var18); // L: 3440 } - if (KeyHandler.field136 > 0) { - var15 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2667, packetWriter.isaacCipher); - var15.packetBuffer.writeShort(0); - var16 = var15.packetBuffer.offset; - long var20 = UserComparator4.method2406(); + if (KeyHandler.field110 > 0) { // L: 3442 + var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2716, packetWriter.isaacCipher); // L: 3443 + var14.packetBuffer.writeShort(0); // L: 3444 + var15 = var14.packetBuffer.offset; // L: 3445 + long var19 = class111.method2516(); // L: 3446 - for (var5 = 0; var5 < KeyHandler.field136; ++var5) { - long var22 = var20 - field719; - if (var22 > 16777215L) { - var22 = 16777215L; + for (var5 = 0; var5 < KeyHandler.field110; ++var5) { // L: 3447 + long var21 = var19 - field565; // L: 3448 + if (var21 > 16777215L) { // L: 3449 + var21 = 16777215L; } - field719 = var20; - var15.packetBuffer.method7117(KeyHandler.field135[var5]); - var15.packetBuffer.method6938((int)var22); + field565 = var19; // L: 3450 + var14.packetBuffer.method7009((int)var21); // L: 3451 + var14.packetBuffer.method6947(KeyHandler.field125[var5]); // L: 3452 } - var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var16); - packetWriter.addNode(var15); + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3454 + packetWriter.addNode(var14); // L: 3455 } - if (field574 > 0) { - --field574; + if (field620 > 0) { // L: 3457 + --field620; } - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field575 = true; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3458 + field555 = true; } - if (field575 && field574 <= 0) { - field574 = 20; - field575 = false; - var15 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2720, packetWriter.isaacCipher); - var15.packetBuffer.method6931(camAngleY); - var15.packetBuffer.writeShort(camAngleX); - packetWriter.addNode(var15); + if (field555 && field620 <= 0) { // L: 3459 + field620 = 20; // L: 3460 + field555 = false; // L: 3461 + var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2699, packetWriter.isaacCipher); // L: 3463 + var14.packetBuffer.method7001(camAngleX); // L: 3464 + var14.packetBuffer.method7003(camAngleY); // L: 3465 + packetWriter.addNode(var14); // L: 3466 } - if (KitDefinition.hasFocus && !hadFocus) { - hadFocus = true; - var15 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2690, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(1); - packetWriter.addNode(var15); + if (WorldMapSectionType.hasFocus && !hadFocus) { // L: 3468 + hadFocus = true; // L: 3469 + var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2743, packetWriter.isaacCipher); // L: 3471 + var14.packetBuffer.writeByte(1); // L: 3472 + packetWriter.addNode(var14); // L: 3473 } - if (!KitDefinition.hasFocus && hadFocus) { - hadFocus = false; - var15 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2690, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - packetWriter.addNode(var15); + if (!WorldMapSectionType.hasFocus && hadFocus) { // L: 3475 + hadFocus = false; // L: 3476 + var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2743, packetWriter.isaacCipher); // L: 3478 + var14.packetBuffer.writeByte(0); // L: 3479 + packetWriter.addNode(var14); // L: 3480 } - if (TileItem.worldMap != null) { - TileItem.worldMap.method6417(); + if (class133.worldMap != null) { // L: 3483 + class133.worldMap.method6487(); } - PacketWriter.method2354(); - SoundCache.method768(); - ModeWhere.method5487(); - if (gameState != 30) { + if (class6.ClanChat_inClanChat) { // L: 3485 + if (AbstractArchive.friendsChat != null) { // L: 3486 + AbstractArchive.friendsChat.sort(); // L: 3487 + } + + TileItem.method2315(); // L: 3489 + class6.ClanChat_inClanChat = false; // L: 3490 + } + + if (class29.field162) { // L: 3494 + UserComparator10.method2494(); // L: 3495 + class29.field162 = false; // L: 3496 + } + + if (GrandExchangeOfferTotalQuantityComparator.Client_plane != field701) { // L: 3500 + field701 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3501 + var1 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3502 + int[] var34 = class10.sceneMinimapSprite.pixels; // L: 3504 + var3 = var34.length; // L: 3505 + + for (var4 = 0; var4 < var3; ++var4) { // L: 3506 + var34[var4] = 0; + } + + for (var4 = 1; var4 < 103; ++var4) { // L: 3507 + var5 = (103 - var4) * 2048 + 24628; // L: 3508 + + for (var6 = 1; var6 < 103; ++var6) { // L: 3509 + if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3510 + GameBuild.scene.drawTileMinimap(var34, var5, 512, var1, var6, var4); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3511 + GameBuild.scene.drawTileMinimap(var34, var5, 512, var1 + 1, var6, var4); + } + + var5 += 4; // L: 3512 + } + } + + var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3515 + var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3516 + class10.sceneMinimapSprite.setRaster(); // L: 3517 + + for (var6 = 1; var6 < 103; ++var6) { // L: 3518 + for (var7 = 1; var7 < 103; ++var7) { // L: 3519 + if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3520 + class111.drawObject(var1, var7, var6, var4, var5); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3521 + class111.drawObject(var1 + 1, var7, var6, var4, var5); + } + } + } + + mapIconCount = 0; // L: 3524 + + for (var6 = 0; var6 < 104; ++var6) { // L: 3525 + for (var7 = 0; var7 < 104; ++var7) { // L: 3526 + long var23 = GameBuild.scene.getFloorDecorationTag(GrandExchangeOfferTotalQuantityComparator.Client_plane, var6, var7); // L: 3527 + if (var23 != 0L) { // L: 3528 + var10 = class21.Entity_unpackID(var23); // L: 3529 + var11 = KitDefinition.getObjectDefinition(var10).mapIconId; // L: 3530 + if (var11 >= 0 && ItemComposition.WorldMapElement_get(var11).field1629) { // L: 3531 3532 + mapIcons[mapIconCount] = ItemComposition.WorldMapElement_get(var11).getSpriteBool(false); // L: 3535 + mapIconXs[mapIconCount] = var6; // L: 3536 + mapIconYs[mapIconCount] = var7; // L: 3537 + ++mapIconCount; // L: 3538 + } + } + } + } + + Canvas.rasterProvider.apply(); // L: 3543 + } + + if (gameState != 30) { // L: 3547 return; } - HorizontalAlignment.method3008(); - WorldMapData_0.method3441(); - ++packetWriter.field1290; - if (packetWriter.field1290 > 750) { - class20.method302(); - return; - } + for (PendingSpawn var42 = (PendingSpawn)pendingSpawns.last(); var42 != null; var42 = (PendingSpawn)pendingSpawns.previous()) { // L: 3549 3550 3569 + if (var42.hitpoints > 0) { // L: 3551 + --var42.hitpoints; + } - MouseHandler.method611(); - ChatChannel.method1985(); - int[] var38 = Players.Players_indices; + if (var42.hitpoints == 0) { // L: 3552 + if (var42.objectId < 0 || NPC.method2265(var42.objectId, var42.field1076)) { // L: 3553 + MusicPatchNode2.addPendingSpawnToScene(var42.plane, var42.type, var42.x, var42.y, var42.objectId, var42.field1075, var42.field1076); // L: 3554 + var42.remove(); // L: 3555 + } + } else { + if (var42.delay > 0) { // L: 3559 + --var42.delay; + } - for (var16 = 0; var16 < Players.Players_count; ++var16) { - Player var24 = players[var38[var16]]; - if (var24 != null && var24.overheadTextCyclesRemaining > 0) { - --var24.overheadTextCyclesRemaining; - if (var24.overheadTextCyclesRemaining == 0) { - var24.overheadText = null; + if (var42.delay == 0 && var42.x >= 1 && var42.y >= 1 && var42.x <= 102 && var42.y <= 102 && (var42.id < 0 || NPC.method2265(var42.id, var42.field1082))) { // L: 3560 3561 + MusicPatchNode2.addPendingSpawnToScene(var42.plane, var42.type, var42.x, var42.y, var42.id, var42.orientation, var42.field1082); // L: 3562 + var42.delay = -1; // L: 3563 + if (var42.id == var42.objectId && var42.objectId == -1) { // L: 3564 + var42.remove(); + } else if (var42.objectId == var42.id && var42.field1075 == var42.orientation && var42.field1076 == var42.field1082) { // L: 3565 + var42.remove(); + } } } } - for (var16 = 0; var16 < npcCount; ++var16) { - var3 = npcIndices[var16]; - NPC var25 = npcs[var3]; - if (var25 != null && var25.overheadTextCyclesRemaining > 0) { - --var25.overheadTextCyclesRemaining; - if (var25.overheadTextCyclesRemaining == 0) { - var25.overheadText = null; + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3573 + var10002 = queuedSoundEffectDelays[var1]--; // L: 3574 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 3575 + SoundEffect var35 = soundEffects[var1]; // L: 3587 + if (var35 == null) { // L: 3588 + var10000 = null; // L: 3589 + var35 = SoundEffect.readSoundEffect(class12.archive4, soundEffectIds[var1], 0); + if (var35 == null) { // L: 3590 + continue; + } + + int[] var56 = queuedSoundEffectDelays; // L: 3591 + var56[var1] += var35.calculateDelay(); + soundEffects[var1] = var35; // L: 3592 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 3598 + if (soundLocations[var1] != 0) { // L: 3600 + var4 = (soundLocations[var1] & 255) * 128; // L: 3601 + var5 = soundLocations[var1] >> 16 & 255; // L: 3602 + var6 = var5 * 128 + 64 - HealthBarDefinition.localPlayer.x; // L: 3603 + if (var6 < 0) { // L: 3604 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 3605 + var8 = var7 * 128 + 64 - HealthBarDefinition.localPlayer.y; // L: 3606 + if (var8 < 0) { // L: 3607 + var8 = -var8; + } + + var9 = var8 + var6 - 128; // L: 3608 + if (var9 > var4) { // L: 3609 + queuedSoundEffectDelays[var1] = -100; // L: 3610 + continue; // L: 3611 + } + + if (var9 < 0) { // L: 3613 + var9 = 0; + } + + var3 = (var4 - var9) * class408.clientPreferences.areaSoundEffectsVolume / var4; // L: 3614 + } else { + var3 = class408.clientPreferences.soundEffectsVolume; // L: 3616 + } + + if (var3 > 0) { // L: 3617 + RawSound var25 = var35.toRawSound().resample(FontName.decimator); // L: 3618 + RawPcmStream var26 = RawPcmStream.createRawPcmStream(var25, 100, var3); // L: 3619 + var26.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3620 + BuddyRankComparator.pcmStreamMixer.addSubStream(var26); // L: 3621 + } + + queuedSoundEffectDelays[var1] = -100; // L: 3623 + } + } else { + --soundEffectCount; // L: 3576 + + for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3577 + soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3578 + soundEffects[var15] = soundEffects[var15 + 1]; // L: 3579 + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3580 + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3581 + soundLocations[var15] = soundLocations[var15 + 1]; // L: 3582 + } + + --var1; // L: 3584 + } + } + + if (field710) { // L: 3626 + if (class247.musicPlayerStatus != 0) { // L: 3629 + var32 = true; // L: 3630 + } else { + var32 = class247.midiPcmStream.isReady(); // L: 3633 + } + + if (!var32) { // L: 3635 + if (class408.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3636 + Archive var36 = Messages.archive6; // L: 3637 + var3 = currentTrackGroupId; // L: 3638 + var4 = class408.clientPreferences.musicVolume; // L: 3639 + class247.musicPlayerStatus = 1; // L: 3641 + class128.musicTrackArchive = var36; // L: 3642 + FillMode.musicTrackGroupId = var3; // L: 3643 + ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 3644 + class247.musicTrackVolume = var4; // L: 3645 + SecureRandomCallable.musicTrackBoolean = false; // L: 3646 + class247.pcmSampleLength = 10000; // L: 3647 + } + + field710 = false; // L: 3650 + } + } + + ++packetWriter.field1275; // L: 3654 + if (packetWriter.field1275 > 750) { // L: 3655 + Clock.method2960(); // L: 3656 + return; // L: 3657 + } + + VerticalAlignment.method3159(); // L: 3659 + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 3661 + var15 = npcIndices[var1]; // L: 3662 + NPC var27 = npcs[var15]; // L: 3663 + if (var27 != null) { // L: 3664 + class135.updateActorSequence(var27, var27.definition.size); // L: 3665 + } + } + + int[] var43 = Players.Players_indices; // L: 3670 + + for (var15 = 0; var15 < Players.Players_count; ++var15) { // L: 3671 + Player var53 = players[var43[var15]]; // L: 3672 + if (var53 != null && var53.overheadTextCyclesRemaining > 0) { // L: 3673 + --var53.overheadTextCyclesRemaining; // L: 3674 + if (var53.overheadTextCyclesRemaining == 0) { // L: 3675 + var53.overheadText = null; } } } - ++field536; - if (mouseCrossColor != 0) { - mouseCrossState += 20; - if (mouseCrossState >= 400) { + for (var15 = 0; var15 < npcCount; ++var15) { // L: 3678 + var3 = npcIndices[var15]; // L: 3679 + NPC var48 = npcs[var3]; // L: 3680 + if (var48 != null && var48.overheadTextCyclesRemaining > 0) { // L: 3681 + --var48.overheadTextCyclesRemaining; // L: 3682 + if (var48.overheadTextCyclesRemaining == 0) { // L: 3683 + var48.overheadText = null; + } + } + } + + ++field531; // L: 3687 + if (mouseCrossColor != 0) { // L: 3688 + mouseCrossState += 20; // L: 3689 + if (mouseCrossState >= 400) { // L: 3690 mouseCrossColor = 0; } } - if (class7.field31 != null) { - ++field620; - if (field620 >= 15) { - class16.invalidateWidget(class7.field31); - class7.field31 = null; + if (WorldMapSection2.field2037 != null) { // L: 3692 + ++field576; // L: 3693 + if (field576 >= 15) { // L: 3694 + class184.invalidateWidget(WorldMapSection2.field2037); // L: 3695 + WorldMapSection2.field2037 = null; // L: 3696 } } - Widget var39 = VarpDefinition.mousedOverWidgetIf1; - Widget var33 = PlayerType.field3661; - VarpDefinition.mousedOverWidgetIf1 = null; - PlayerType.field3661 = null; - draggedOnWidget = null; - field671 = false; - field595 = false; - field726 = 0; + Widget var44 = WorldMapData_0.mousedOverWidgetIf1; // L: 3699 + Widget var37 = Skills.field3247; // L: 3700 + WorldMapData_0.mousedOverWidgetIf1 = null; // L: 3701 + Skills.field3247 = null; // L: 3702 + draggedOnWidget = null; // L: 3703 + field680 = false; // L: 3704 + field648 = false; // L: 3705 + field695 = 0; // L: 3706 - while (CollisionMap.isKeyDown() && field726 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class4.field13 == 66) { - String var41 = class78.method2062(); - class21.client.method450(var41); - } else if (oculusOrbState != 1 || Skeleton.field2376 <= 0) { - field718[field726] = class4.field13; - field532[field726] = Skeleton.field2376; - ++field726; + while (WorldMapElement.isKeyDown() && field695 < 128) { // L: 3707 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class12.field55 == 66) { // L: 3708 + String var49 = ""; // L: 3711 + + Message var45; + for (Iterator var50 = Messages.Messages_hashTable.iterator(); var50.hasNext(); var49 = var49 + var45.sender + ':' + var45.text + '\n') { // L: 3712 3715 + var45 = (Message)var50.next(); // L: 3713 + } + + ArchiveLoader.client.method484(var49); // L: 3721 + } else if (oculusOrbState != 1 || class319.field3858 <= 0) { // L: 3724 + field697[field695] = class12.field55; // L: 3727 + field696[field695] = class319.field3858; // L: 3728 + ++field695; // L: 3729 } } - boolean var34 = staffModLevel >= 2; - if (var34 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = class67.localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { + boolean var38 = staffModLevel >= 2; // L: 3733 + if (var38 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3735 + var4 = HealthBarDefinition.localPlayer.plane - mouseWheelRotation; // L: 3736 + if (var4 < 0) { // L: 3737 var4 = 0; - } else if (var4 > 3) { + } else if (var4 > 3) { // L: 3738 var4 = 3; } - if (var4 != class67.localPlayer.plane) { - UrlRequest.method2386(class67.localPlayer.pathX[0] + WorldMapSectionType.baseX, class67.localPlayer.pathY[0] + PlayerComposition.baseY, var4, false); + if (var4 != HealthBarDefinition.localPlayer.plane) { // L: 3739 + InvDefinition.method2986(HealthBarDefinition.localPlayer.pathX[0] + class19.baseX, HealthBarDefinition.localPlayer.pathY[0] + DefaultsGroup.baseY, var4, false); // L: 3740 } - mouseWheelRotation = 0; + mouseWheelRotation = 0; // L: 3742 } - if (rootInterface != -1) { - class87.updateRootInterface(rootInterface, 0, 0, Huffman.canvasWidth, MouseRecorder.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3744 + Messages.updateRootInterface(rootInterface, 0, 0, GameEngine.canvasWidth, KeyHandler.canvasHeight, 0, 0); } - ++cycleCntr; + ++cycleCntr; // L: 3745 while (true) { - Widget var26; - Widget var40; - ScriptEvent var42; + Widget var46; + ScriptEvent var51; + Widget var52; do { - var42 = (ScriptEvent)field731.removeLast(); - if (var42 == null) { + var51 = (ScriptEvent)field674.removeLast(); // L: 3747 + if (var51 == null) { // L: 3748 while (true) { do { - var42 = (ScriptEvent)field695.removeLast(); - if (var42 == null) { + var51 = (ScriptEvent)field675.removeLast(); // L: 3759 + if (var51 == null) { // L: 3760 while (true) { do { - var42 = (ScriptEvent)scriptEvents.removeLast(); - if (var42 == null) { - this.menu(); - SequenceDefinition.method3381(); - if (clickedWidget != null) { - this.method1349(); + var51 = (ScriptEvent)scriptEvents.removeLast(); // L: 3771 + if (var51 == null) { // L: 3772 + this.menu(); // L: 3782 + if (class133.worldMap != null) { // L: 3784 + class133.worldMap.method6497(GrandExchangeOfferTotalQuantityComparator.Client_plane, (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX, (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY, false); // L: 3785 + class133.worldMap.loadCache(); // L: 3786 } - if (GameEngine.dragInventoryWidget != null) { - class16.invalidateWidget(GameEngine.dragInventoryWidget); - ++itemDragDuration; - if (MouseHandler.MouseHandler_currentButton == 0) { - if (field602) { - if (Projectile.hoveredItemContainer == GameEngine.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { - Widget var43 = GameEngine.dragInventoryWidget; - byte var35 = 0; - if (field655 == 1 && var43.contentType == 206) { - var35 = 1; + if (clickedWidget != null) { // L: 3789 + this.method1186(); + } + + if (class247.dragInventoryWidget != null) { // L: 3790 + class184.invalidateWidget(class247.dragInventoryWidget); // L: 3791 + ++itemDragDuration; // L: 3792 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3793 + if (field667) { // L: 3794 + if (class274.hoveredItemContainer == class247.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3795 + Widget var54 = class247.dragInventoryWidget; // L: 3796 + byte var39 = 0; // L: 3797 + if (field656 == 1 && var54.contentType == 206) { // L: 3798 + var39 = 1; } - if (var43.itemIds[dragItemSlotDestination] <= 0) { - var35 = 0; + if (var54.itemIds[dragItemSlotDestination] <= 0) { // L: 3799 + var39 = 0; } - if (class114.method2493(WorldMapRegion.getWidgetFlags(var43))) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; - var43.itemIds[var7] = var43.itemIds[var6]; - var43.itemQuantities[var7] = var43.itemQuantities[var6]; - var43.itemIds[var6] = -1; - var43.itemQuantities[var6] = 0; - } else if (var35 == 1) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; + if (TileItem.method2316(PendingSpawn.getWidgetFlags(var54))) { // L: 3800 + var6 = dragItemSlotSource; // L: 3801 + var7 = dragItemSlotDestination; // L: 3802 + var54.itemIds[var7] = var54.itemIds[var6]; // L: 3803 + var54.itemQuantities[var7] = var54.itemQuantities[var6]; // L: 3804 + var54.itemIds[var6] = -1; // L: 3805 + var54.itemQuantities[var6] = 0; // L: 3806 + } else if (var39 == 1) { // L: 3808 + var6 = dragItemSlotSource; // L: 3809 + var7 = dragItemSlotDestination; // L: 3810 - while (var6 != var7) { - if (var6 > var7) { - var43.swapItems(var6 - 1, var6); - --var6; - } else if (var6 < var7) { - var43.swapItems(var6 + 1, var6); - ++var6; + while (var7 != var6) { // L: 3811 + if (var6 > var7) { // L: 3812 + var54.swapItems(var6 - 1, var6); // L: 3813 + --var6; // L: 3814 + } else if (var6 < var7) { // L: 3816 + var54.swapItems(var6 + 1, var6); // L: 3817 + ++var6; // L: 3818 } } } else { - var43.swapItems(dragItemSlotDestination, dragItemSlotSource); + var54.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3823 } - var19 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2755, packetWriter.isaacCipher); - var19.packetBuffer.method7117(var35); - var19.packetBuffer.method7029(dragItemSlotSource); - var19.packetBuffer.method7029(dragItemSlotDestination); - var19.packetBuffer.writeInt(GameEngine.dragInventoryWidget.id); - packetWriter.addNode(var19); + var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2669, packetWriter.isaacCipher); // L: 3826 + var18.packetBuffer.method7001(dragItemSlotDestination); // L: 3827 + var18.packetBuffer.method7003(dragItemSlotSource); // L: 3828 + var18.packetBuffer.method6993(var39); // L: 3829 + var18.packetBuffer.method7010(class247.dragInventoryWidget.id); // L: 3830 + packetWriter.addNode(var18); // L: 3831 } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(draggedWidgetX, draggedWidgetY); - } else if (menuOptionsCount > 0) { - Renderable.method4395(draggedWidgetX, draggedWidgetY); + } else if (this.shouldLeftClickOpenMenu()) { // L: 3835 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3836 + } else if (menuOptionsCount > 0) { // L: 3838 + var4 = draggedWidgetX; // L: 3839 + var5 = draggedWidgetY; // L: 3840 + MenuAction var47 = class274.tempMenuAction; // L: 3842 + class14.menuAction(var47.param0, var47.param1, var47.opcode, var47.identifier, var47.action, var47.action, var4, var5); // L: 3844 + class274.tempMenuAction = null; // L: 3846 } - field620 = 10; - MouseHandler.MouseHandler_lastButton = 0; - GameEngine.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)) { - field602 = true; + field576 = 10; // L: 3850 + MouseHandler.MouseHandler_lastButton = 0; // L: 3851 + class247.dragInventoryWidget = null; // L: 3852 + } 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: 3855 3856 + field667 = true; // L: 3857 } } - if (Scene.shouldSendWalk()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var19 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2703, packetWriter.isaacCipher); - var19.packetBuffer.writeByte(5); - var19.packetBuffer.method7029(var4 + WorldMapSectionType.baseX); - var19.packetBuffer.method6931(var5 + PlayerComposition.baseY); - var19.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.addNode(var19); - Scene.method4243(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; + if (Scene.shouldSendWalk()) { // L: 3862 + var4 = Scene.Scene_selectedX; // L: 3863 + var5 = Scene.Scene_selectedY; // L: 3864 + var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2703, packetWriter.isaacCipher); // L: 3866 + var18.packetBuffer.writeByte(5); // L: 3867 + var18.packetBuffer.method6962(var4 + class19.baseX); // L: 3868 + var18.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3869 + var18.packetBuffer.method7003(var5 + DefaultsGroup.baseY); // L: 3870 + packetWriter.addNode(var18); // L: 3871 + Scene.method4451(); // L: 3872 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3873 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3874 + mouseCrossColor = 1; // L: 3875 + mouseCrossState = 0; // L: 3876 + destinationX = var4; // L: 3877 + destinationY = var5; // L: 3878 } - if (var39 != VarpDefinition.mousedOverWidgetIf1) { - if (var39 != null) { - class16.invalidateWidget(var39); + if (var44 != WorldMapData_0.mousedOverWidgetIf1) { // L: 3880 + if (var44 != null) { // L: 3881 + class184.invalidateWidget(var44); } - if (VarpDefinition.mousedOverWidgetIf1 != null) { - class16.invalidateWidget(VarpDefinition.mousedOverWidgetIf1); + if (WorldMapData_0.mousedOverWidgetIf1 != null) { // L: 3882 + class184.invalidateWidget(WorldMapData_0.mousedOverWidgetIf1); } } - if (var33 != PlayerType.field3661 && field642 == field557) { - if (var33 != null) { - class16.invalidateWidget(var33); + if (var37 != Skills.field3247 && field714 == field621) { // L: 3884 + if (var37 != null) { // L: 3885 + class184.invalidateWidget(var37); } - if (PlayerType.field3661 != null) { - class16.invalidateWidget(PlayerType.field3661); + if (Skills.field3247 != null) { // L: 3886 + class184.invalidateWidget(Skills.field3247); } } - if (PlayerType.field3661 != null) { - if (field557 < field642) { - ++field557; - if (field557 == field642) { - class16.invalidateWidget(PlayerType.field3661); + if (Skills.field3247 != null) { // L: 3888 + if (field621 < field714) { // L: 3889 + ++field621; // L: 3890 + if (field621 == field714) { // L: 3891 + class184.invalidateWidget(Skills.field3247); } } - } else if (field557 > 0) { - --field557; + } else if (field621 > 0) { // L: 3894 + --field621; } - int var27; - if (oculusOrbState == 0) { - var4 = class67.localPlayer.x; - var5 = class67.localPlayer.y; - if (class132.oculusOrbFocalPointX - var4 < -500 || class132.oculusOrbFocalPointX - var4 > 500 || LoginScreenAnimation.oculusOrbFocalPointY - var5 < -500 || LoginScreenAnimation.oculusOrbFocalPointY - var5 > 500) { - class132.oculusOrbFocalPointX = var4; - LoginScreenAnimation.oculusOrbFocalPointY = var5; + if (oculusOrbState == 0) { // L: 3896 + var4 = HealthBarDefinition.localPlayer.x; // L: 3897 + var5 = HealthBarDefinition.localPlayer.y; // L: 3898 + if (class320.oculusOrbFocalPointX - var4 < -500 || class320.oculusOrbFocalPointX - var4 > 500 || class18.oculusOrbFocalPointY - var5 < -500 || class18.oculusOrbFocalPointY - var5 > 500) { // L: 3899 + class320.oculusOrbFocalPointX = var4; // L: 3900 + class18.oculusOrbFocalPointY = var5; // L: 3901 } - if (var4 != class132.oculusOrbFocalPointX) { - class132.oculusOrbFocalPointX += (var4 - class132.oculusOrbFocalPointX) / 16; + if (var4 != class320.oculusOrbFocalPointX) { // L: 3903 + class320.oculusOrbFocalPointX += (var4 - class320.oculusOrbFocalPointX) / 16; } - if (var5 != LoginScreenAnimation.oculusOrbFocalPointY) { - LoginScreenAnimation.oculusOrbFocalPointY += (var5 - LoginScreenAnimation.oculusOrbFocalPointY) / 16; + if (var5 != class18.oculusOrbFocalPointY) { // L: 3904 + class18.oculusOrbFocalPointY += (var5 - class18.oculusOrbFocalPointY) / 16; } - var6 = class132.oculusOrbFocalPointX >> 7; - var7 = LoginScreenAnimation.oculusOrbFocalPointY >> 7; - var8 = MidiPcmStream.getTileHeight(class132.oculusOrbFocalPointX, LoginScreenAnimation.oculusOrbFocalPointY, VertexNormal.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 = VertexNormal.Client_plane; - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { + var6 = class320.oculusOrbFocalPointX >> 7; // L: 3905 + var7 = class18.oculusOrbFocalPointY >> 7; // L: 3906 + var8 = class392.getTileHeight(class320.oculusOrbFocalPointX, class18.oculusOrbFocalPointY, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 3907 + var9 = 0; // L: 3908 + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3909 + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3910 + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3911 + var12 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3912 + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3913 ++var12; } - var27 = var8 - Tiles.Tiles_heights[var12][var10][var11]; - if (var27 > var9) { - var9 = var27; + int var28 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3914 + if (var28 > var9) { // L: 3915 + var9 = var28; } } } } - var10 = var9 * 192; - if (var10 > 98048) { + var10 = var9 * 192; // L: 3919 + if (var10 > 98048) { // L: 3920 var10 = 98048; } - if (var10 < 32768) { + if (var10 < 32768) { // L: 3921 var10 = 32768; } - if (var10 > field565) { - field565 += (var10 - field565) / 24; - } else if (var10 < field565) { - field565 += (var10 - field565) / 80; + if (var10 > field556) { // L: 3922 + field556 += (var10 - field556) / 24; + } else if (var10 < field556) { // L: 3923 + field556 += (var10 - field556) / 80; } - class194.field2186 = MidiPcmStream.getTileHeight(class67.localPlayer.x, class67.localPlayer.y, VertexNormal.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - GrandExchangeOffer.method5422(); - short var36 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var36 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var36 = 1024; + DynamicObject.field942 = class392.getTileHeight(HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, GrandExchangeOfferTotalQuantityComparator.Client_plane) - camFollowHeight; // L: 3924 + } else if (oculusOrbState == 1) { // L: 3926 + if (field511 && HealthBarDefinition.localPlayer != null) { // L: 3928 + var4 = HealthBarDefinition.localPlayer.pathX[0]; // L: 3929 + var5 = HealthBarDefinition.localPlayer.pathY[0]; // L: 3930 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 3931 + class320.oculusOrbFocalPointX = HealthBarDefinition.localPlayer.x; // L: 3932 + var6 = class392.getTileHeight(HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, GrandExchangeOfferTotalQuantityComparator.Client_plane) - camFollowHeight; // L: 3933 + if (var6 < DynamicObject.field942) { // L: 3934 + DynamicObject.field942 = var6; + } + + class18.oculusOrbFocalPointY = HealthBarDefinition.localPlayer.y; // L: 3935 + field511 = false; // L: 3936 + } } - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var36 == 0) { - var36 = 1792; - } else if (var36 == 1024) { - var36 = 1280; + short var40 = -1; // L: 3939 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3940 + var40 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3941 + var40 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3942 + if (var40 == 0) { // L: 3943 + var40 = 1792; + } else if (var40 == 1024) { // L: 3944 + var40 = 1280; } else { - var36 = 1536; + var40 = 1536; // L: 3945 } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var36 == 0) { - var36 = 256; - } else if (var36 == 1024) { - var36 = 768; + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3947 + if (var40 == 0) { // L: 3948 + var40 = 256; + } else if (var40 == 1024) { // L: 3949 + var40 = 768; } else { - var36 = 512; + var40 = 512; // L: 3950 } } - byte var37 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var37 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var37 = 1; + byte var41 = 0; // L: 3952 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3953 + var41 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3954 + var41 = 1; } - var6 = 0; - if (var36 >= 0 || var37 != 0) { - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 1796605093 * -601734355 : oculusOrbNormalSpeed * -1229982081 * -1571436161; - var6 *= 16; - field727 = var36; - field661 = var37; + var6 = 0; // L: 3955 + if (var40 >= 0 || var41 != 0) { // L: 3956 + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -1748111485 * 2001475371 : oculusOrbNormalSpeed * -347452533 * -567507933; // L: 3957 + var6 *= 16; // L: 3958 + field520 = var40; // L: 3959 + field549 = var41; // L: 3960 } - if (field567 < var6) { - field567 += var6 / 8; - if (field567 > var6) { - field567 = var6; + if (field547 < var6) { // L: 3962 + field547 += var6 / 8; // L: 3963 + if (field547 > var6) { // L: 3964 + field547 = var6; } - } else if (field567 > var6) { - field567 = field567 * 9 / 10; + } else if (field547 > var6) { // L: 3966 + field547 = field547 * 9 / 10; } - if (field567 > 0) { - var7 = field567 / 16; - if (field727 >= 0) { - var4 = field727 - HealthBarUpdate.cameraYaw & 2047; - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; - class132.oculusOrbFocalPointX += var8 * var7 / 65536; - LoginScreenAnimation.oculusOrbFocalPointY += var9 * var7 / 65536; + if (field547 > 0) { // L: 3967 + var7 = field547 / 16; // L: 3968 + if (field520 >= 0) { // L: 3969 + var4 = field520 - WorldMapRegion.cameraYaw & 2047; // L: 3970 + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3971 + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3972 + class320.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 3973 + class18.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 3974 } - if (field661 != 0) { - class194.field2186 += var7 * field661; - if (class194.field2186 > 0) { - class194.field2186 = 0; + if (field549 != 0) { // L: 3976 + DynamicObject.field942 += var7 * field549; // L: 3977 + if (DynamicObject.field942 > 0) { // L: 3978 + DynamicObject.field942 = 0; } } } else { - field727 = -1; - field661 = -1; + field520 = -1; // L: 3982 + field549 = -1; // L: 3983 } - if (KeyHandler.KeyHandler_pressedKeys[13]) { - KitDefinition.method2956(); + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3985 + class29.method413(); // L: 3986 } } - if (MouseHandler.MouseHandler_currentButton == 4 && VarbitComposition.mouseCam) { - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var4 * 2; - mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -618093599 * 2082398241; - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var5 * 2; - mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1104277309 * -782573547; + if (MouseHandler.MouseHandler_currentButton == 4 && ApproximateRouteStrategy.mouseCam) { // L: 3989 + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3990 + camAngleDX = var4 * 2; // L: 3991 + mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 111270843 * -1137004173; // L: 3992 + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3993 + camAngleDY = var5 * 2; // L: 3994 + mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -1783686409 * 1769064135; // L: 3995 } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3998 camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3999 camAngleDY += (24 - camAngleDY) / 2; } else { - camAngleDY /= 2; + camAngleDY /= 2; // L: 4000 } - if (KeyHandler.KeyHandler_pressedKeys[98]) { + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4001 camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4002 camAngleDX += (-12 - camAngleDX) / 2; } else { - camAngleDX /= 2; + camAngleDX /= 2; // L: 4003 } - mouseCamClickedY = MouseHandler.MouseHandler_y; - mouseCamClickedX = MouseHandler.MouseHandler_x; + mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4004 + mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4005 } - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { + camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 4007 + camAngleX += camAngleDX / 2; // L: 4008 + if (camAngleX < 128) { // L: 4009 camAngleX = 128; } - if (camAngleX > 383) { + if (camAngleX > 383) { // L: 4010 camAngleX = 383; } - if (isCameraLocked) { - var4 = PcmPlayer.field284 * 128 + 64; - var5 = class120.field1408 * 128 + 64; - var6 = MidiPcmStream.getTileHeight(var4, var5, VertexNormal.Client_plane) - PacketBufferNode.field2786; - if (Canvas.cameraX < var4) { - Canvas.cameraX = (var4 - Canvas.cameraX) * class281.field3324 / 1000 + Canvas.cameraX + Login.field906; - if (Canvas.cameraX > var4) { - Canvas.cameraX = var4; - } - } - - if (Canvas.cameraX > var4) { - Canvas.cameraX -= class281.field3324 * (Canvas.cameraX - var4) / 1000 + Login.field906; - if (Canvas.cameraX < var4) { - Canvas.cameraX = var4; - } - } - - if (class14.cameraY < var6) { - class14.cameraY = (var6 - class14.cameraY) * class281.field3324 / 1000 + class14.cameraY + Login.field906; - if (class14.cameraY > var6) { - class14.cameraY = var6; - } - } - - if (class14.cameraY > var6) { - class14.cameraY -= class281.field3324 * (class14.cameraY - var6) / 1000 + Login.field906; - if (class14.cameraY < var6) { - class14.cameraY = var6; - } - } - - if (VarpDefinition.cameraZ < var5) { - VarpDefinition.cameraZ = (var5 - VarpDefinition.cameraZ) * class281.field3324 / 1000 + VarpDefinition.cameraZ + Login.field906; - if (VarpDefinition.cameraZ > var5) { - VarpDefinition.cameraZ = var5; - } - } - - if (VarpDefinition.cameraZ > var5) { - VarpDefinition.cameraZ -= class281.field3324 * (VarpDefinition.cameraZ - var5) / 1000 + Login.field906; - if (VarpDefinition.cameraZ < var5) { - VarpDefinition.cameraZ = var5; - } - } - - var4 = Varcs.field1272 * 128 + 64; - var5 = World.field774 * 128 + 64; - var6 = MidiPcmStream.getTileHeight(var4, var5, VertexNormal.Client_plane) - class9.field44; - var7 = var4 - Canvas.cameraX; - var8 = var6 - class14.cameraY; - var9 = var5 - VarpDefinition.cameraZ; - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (var11 < 128) { - var11 = 128; - } - - if (var11 > 383) { - var11 = 383; - } - - if (WorldMapIcon_1.cameraPitch < var11) { - WorldMapIcon_1.cameraPitch = (var11 - WorldMapIcon_1.cameraPitch) * AbstractArchive.field3712 / 1000 + WorldMapIcon_1.cameraPitch + SequenceDefinition.field1954; - if (WorldMapIcon_1.cameraPitch > var11) { - WorldMapIcon_1.cameraPitch = var11; - } - } - - if (WorldMapIcon_1.cameraPitch > var11) { - WorldMapIcon_1.cameraPitch -= AbstractArchive.field3712 * (WorldMapIcon_1.cameraPitch - var11) / 1000 + SequenceDefinition.field1954; - if (WorldMapIcon_1.cameraPitch < var11) { - WorldMapIcon_1.cameraPitch = var11; - } - } - - var27 = var12 - HealthBarUpdate.cameraYaw; - if (var27 > 1024) { - var27 -= 2048; - } - - if (var27 < -1024) { - var27 += 2048; - } - - if (var27 > 0) { - HealthBarUpdate.cameraYaw = HealthBarUpdate.cameraYaw + SequenceDefinition.field1954 + var27 * AbstractArchive.field3712 / 1000; - HealthBarUpdate.cameraYaw &= 2047; - } - - if (var27 < 0) { - HealthBarUpdate.cameraYaw -= -var27 * AbstractArchive.field3712 / 1000 + SequenceDefinition.field1954; - HealthBarUpdate.cameraYaw &= 2047; - } - - int var14 = var12 - HealthBarUpdate.cameraYaw; - if (var14 > 1024) { - var14 -= 2048; - } - - if (var14 < -1024) { - var14 += 2048; - } - - if (var14 < 0 && var27 > 0 || var14 > 0 && var27 < 0) { - HealthBarUpdate.cameraYaw = var12; - } + if (isCameraLocked) { // L: 4012 + class123.method2621(); } - for (var4 = 0; var4 < 5; ++var4) { - int var10002 = field743[var4]++; + for (var4 = 0; var4 < 5; ++var4) { // L: 4013 + var10002 = field722[var4]++; } - Tile.varcs.tryWrite(); - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - var6 = JagexCache.method2815(); - PacketBufferNode var28; - if (var4 > 15000 && var6 > 15000) { - logoutTimer = 250; - class130.method2677(14500); - var28 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2727, packetWriter.isaacCipher); - packetWriter.addNode(var28); + Message.varcs.tryWrite(); // L: 4014 + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 4017 + var6 = GameEngine.method584(); // L: 4020 + PacketBufferNode var29; + if (var4 > 15000 && var6 > 15000) { // L: 4021 + logoutTimer = 250; // L: 4022 + ClanSettings.method2703(14500); // L: 4023 + var29 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2719, packetWriter.isaacCipher); // L: 4025 + packetWriter.addNode(var29); // L: 4026 } - Message.friendSystem.processFriendUpdates(); - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var28 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2706, packetWriter.isaacCipher); - packetWriter.addNode(var28); + class112.friendSystem.processFriendUpdates(); // L: 4028 + ++packetWriter.pendingWrites; // L: 4029 + if (packetWriter.pendingWrites > 50) { // L: 4030 + var29 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2726, packetWriter.isaacCipher); // L: 4032 + packetWriter.addNode(var29); // L: 4033 } try { - packetWriter.flush(); - } catch (IOException var29) { - class20.method302(); + packetWriter.flush(); // L: 4036 + } catch (IOException var30) { // L: 4038 + Clock.method2960(); // L: 4039 } - return; + return; // L: 4041 } - var26 = var42.widget; - if (var26.childIndex < 0) { + var52 = var51.widget; // L: 3773 + if (var52.childIndex < 0) { // L: 3774 break; } - var40 = HealthBarUpdate.getWidget(var26.parentId); - } while(var40 == null || var40.children == null || var26.childIndex >= var40.children.length || var26 != var40.children[var26.childIndex]); + var46 = UserComparator9.getWidget(var52.parentId); // L: 3775 + } while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3776 - ViewportMouse.runScriptEvent(var42); + Tile.runScriptEvent(var51); // L: 3780 } } - var26 = var42.widget; - if (var26.childIndex < 0) { + var52 = var51.widget; // L: 3761 + if (var52.childIndex < 0) { // L: 3762 break; } - var40 = HealthBarUpdate.getWidget(var26.parentId); - } while(var40 == null || var40.children == null || var26.childIndex >= var40.children.length || var26 != var40.children[var26.childIndex]); + var46 = UserComparator9.getWidget(var52.parentId); // L: 3763 + } while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3764 - ViewportMouse.runScriptEvent(var42); + Tile.runScriptEvent(var51); // L: 3768 } } - var26 = var42.widget; - if (var26.childIndex < 0) { + var52 = var51.widget; // L: 3749 + if (var52.childIndex < 0) { // L: 3750 break; } - var40 = HealthBarUpdate.getWidget(var26.parentId); - } while(var40 == null || var40.children == null || var26.childIndex >= var40.children.length || var26 != var40.children[var26.childIndex]); + var46 = UserComparator9.getWidget(var52.parentId); // L: 3751 + } while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3752 - ViewportMouse.runScriptEvent(var42); + Tile.runScriptEvent(var51); // L: 3756 } } - var32 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2704, packetWriter.isaacCipher); - var32.packetBuffer.writeByte(0); - var3 = var32.packetBuffer.offset; - KitDefinition.performReflectionCheck(var32.packetBuffer); - var32.packetBuffer.method6918(var32.packetBuffer.offset - var3); - packetWriter.addNode(var32); + var33 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2676, packetWriter.isaacCipher); // L: 3318 + var33.packetBuffer.writeByte(0); // L: 3319 + var3 = var33.packetBuffer.offset; // L: 3320 + class16.performReflectionCheck(var33.packetBuffer); // L: 3321 + var33.packetBuffer.method6963(var33.packetBuffer.offset - var3); // L: 3322 + packetWriter.addNode(var33); // L: 3323 } } } - } + } // L: 3300 - @ObfuscatedName("fr") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "295331823" + descriptor = "(B)V", + garbageValue = "43" ) @Export("resizeJS") void resizeJS() { - int var1 = Huffman.canvasWidth; - int var2 = MouseRecorder.canvasHeight; - if (super.contentWidth < var1) { + int var1 = GameEngine.canvasWidth; // L: 4584 + int var2 = KeyHandler.canvasHeight; // L: 4585 + if (super.contentWidth < var1) { // L: 4586 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; + var2 = super.contentHeight; // L: 4587 } - if (WorldMapDecorationType.clientPreferences != null) { + if (class408.clientPreferences != null) { // L: 4588 try { - class27.method406(class21.client, "resize", new Object[]{class12.getWindowedMode()}); - } catch (Throwable var4) { + class27.method394(ArchiveLoader.client, "resize", new Object[]{class134.getWindowedMode()}); // L: 4590 + } catch (Throwable var4) { // L: 4592 } } - } + } // L: 4594 - @ObfuscatedName("fx") + @ObfuscatedName("gg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1818223582" + garbageValue = "-693987024" ) @Export("drawLoggedIn") final void drawLoggedIn() { + if (rootInterface != -1) { // L: 4597 + DirectByteArrayCopier.method5179(rootInterface); + } + int var1; - if (rootInterface != -1) { - var1 = rootInterface; - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var1)) { - class9.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4598 + if (field594[var1]) { // L: 4599 + field553[var1] = true; + } + + field651[var1] = field594[var1]; // L: 4600 + field594[var1] = false; // L: 4601 + } + + field678 = cycle; // L: 4603 + viewportX = -1; // L: 4604 + viewportY = -1; // L: 4605 + class274.hoveredItemContainer = null; // L: 4606 + if (rootInterface != -1) { // L: 4607 + rootWidgetCount = 0; // L: 4608 + HorizontalAlignment.drawWidgets(rootInterface, 0, 0, GameEngine.canvasWidth, KeyHandler.canvasHeight, 0, 0, -1); // L: 4609 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4611 + if (showMouseCross) { // L: 4612 + if (mouseCrossColor == 1) { // L: 4613 + UserComparator10.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4614 + } + + if (mouseCrossColor == 2) { // L: 4616 + UserComparator10.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4617 } } - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field710[var1]) { - field701[var1] = true; - } - - field525[var1] = field710[var1]; - field710[var1] = false; - } - - field699 = cycle; - viewportX = -1; - viewportY = -1; - Projectile.hoveredItemContainer = null; - if (rootInterface != -1) { - rootWidgetCount = 0; - Canvas.drawWidgets(rootInterface, 0, 0, Huffman.canvasWidth, MouseRecorder.canvasHeight, 0, 0, -1); - } - - Rasterizer2D.Rasterizer2D_resetClip(); - if (showMouseCross) { - if (mouseCrossColor == 1) { - SecureRandomFuture.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); - } - - if (mouseCrossColor == 2) { - SecureRandomFuture.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); - } - } - - if (!isMenuOpen) { - if (viewportX != -1) { - var1 = viewportX; - int var2 = viewportY; - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - int var3 = menuOptionsCount - 1; - String var5; - if (isItemSelected == 1 && menuOptionsCount < 2) { - var5 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { - var5 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; - } else { - String var6; - if (var3 < 0) { - var6 = ""; - } else if (menuTargets[var3].length() > 0) { - var6 = menuActions[var3] + " " + menuTargets[var3]; - } else { - var6 = menuActions[var3]; - } - - var5 = var6; - } - - if (menuOptionsCount > 2) { - var5 = var5 + FloorUnderlayDefinition.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - Interpreter.fontBold12.drawRandomAlphaAndSpacing(var5, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); - } + if (!isMenuOpen) { // L: 4620 + if (viewportX != -1) { // L: 4621 + SecureRandomFuture.method1979(viewportX, viewportY); } } else { - SecureRandomCallable.method2035(); + Message.method1146(); // L: 4623 } - if (gameDrawingMode == 3) { - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field525[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field701[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); + if (gameDrawingMode == 3) { // L: 4624 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4625 + if (field651[var1]) { // L: 4626 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4627 + } else if (field553[var1]) { // L: 4629 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4630 } } } - class194.method3875(VertexNormal.Client_plane, class67.localPlayer.x, class67.localPlayer.y, field536); - field536 = 0; - } + class130.method2746(GrandExchangeOfferTotalQuantityComparator.Client_plane, HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, field531); // L: 4634 + field531 = 0; // L: 4635 + } // L: 4636 - @ObfuscatedName("hj") + @ObfuscatedName("ho") @ObfuscatedSignature( - descriptor = "(Lcc;I)Z", - garbageValue = "-382316023" + descriptor = "(Lcv;I)Z", + garbageValue = "-1849354153" ) - final boolean method1307(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); - PacketBuffer var3 = var1.packetBuffer; - if (var2 == null) { + final boolean method1180(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 6027 + PacketBuffer var3 = var1.packetBuffer; // L: 6028 + if (var2 == null) { // L: 6029 return false; } else { - int var6; - String var18; + int var18; + String var19; try { int var5; - if (var1.serverPacket == null) { - if (var1.field1289) { - if (!var2.isAvailable(1)) { + if (var1.serverPacket == null) { // L: 6031 + if (var1.field1280) { // L: 6032 + if (!var2.isAvailable(1)) { // L: 6033 return false; } - var2.read(var1.packetBuffer.array, 0, 1); - var1.field1290 = 0; - var1.field1289 = false; + var2.read(var1.packetBuffer.array, 0, 1); // L: 6034 + var1.field1275 = 0; // L: 6035 + var1.field1280 = false; // L: 6036 } - var3.offset = 0; - if (var3.method6848()) { - if (!var2.isAvailable(1)) { + var3.offset = 0; // L: 6038 + if (var3.method6912()) { // L: 6039 + if (!var2.isAvailable(1)) { // L: 6040 return false; } - var2.read(var1.packetBuffer.array, 1, 1); - var1.field1290 = 0; + var2.read(var1.packetBuffer.array, 1, 1); // L: 6041 + var1.field1275 = 0; // L: 6042 } - var1.field1289 = true; - ServerPacket[] var4 = WallDecoration.ServerPacket_values(); - var5 = var3.readSmartByteShortIsaac(); - if (var5 < 0 || var5 >= var4.length) { + var1.field1280 = true; // L: 6044 + ServerPacket[] var4 = class128.ServerPacket_values(); // L: 6045 + var5 = var3.readSmartByteShortIsaac(); // L: 6046 + if (var5 < 0 || var5 >= var4.length) { // L: 6047 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; - var1.serverPacketLength = var1.serverPacket.length; + var1.serverPacket = var4[var5]; // L: 6048 + var1.serverPacketLength = var1.serverPacket.length; // L: 6049 } - if (var1.serverPacketLength == -1) { - if (!var2.isAvailable(1)) { + if (var1.serverPacketLength == -1) { // L: 6051 + if (!var2.isAvailable(1)) { // L: 6052 return false; } - var1.getSocket().read(var3.array, 0, 1); - var1.serverPacketLength = var3.array[0] & 255; + var1.getSocket().read(var3.array, 0, 1); // L: 6053 + var1.serverPacketLength = var3.array[0] & 255; // L: 6054 } - if (var1.serverPacketLength == -2) { - if (!var2.isAvailable(2)) { + if (var1.serverPacketLength == -2) { // L: 6056 + if (!var2.isAvailable(2)) { // L: 6057 return false; } - var1.getSocket().read(var3.array, 0, 2); - var3.offset = 0; - var1.serverPacketLength = var3.readUnsignedShort(); + var1.getSocket().read(var3.array, 0, 2); // L: 6058 + var3.offset = 0; // L: 6059 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 6060 } - if (!var2.isAvailable(var1.serverPacketLength)) { + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6062 return false; } - var3.offset = 0; - var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1290 = 0; - timer.method5903(); - var1.field1288 = var1.field1293; - var1.field1293 = var1.field1281; - var1.field1281 = var1.serverPacket; + var3.offset = 0; // L: 6063 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 6064 + var1.field1275 = 0; // L: 6065 + timer.method5972(); // L: 6066 + var1.field1285 = var1.field1284; // L: 6067 + var1.field1284 = var1.field1277; // L: 6068 + var1.field1277 = var1.serverPacket; // L: 6069 int var17; - Widget var63; - if (ServerPacket.field2862 == var1.serverPacket) { - var17 = var3.method6944(); - var63 = HealthBarUpdate.getWidget(var17); - - for (var6 = 0; var6 < var63.itemIds.length; ++var6) { - var63.itemIds[var6] = -1; - var63.itemIds[var6] = 0; - } - - class16.invalidateWidget(var63); - var1.serverPacket = null; - return true; - } - - byte var68; - if (ServerPacket.field2809 == var1.serverPacket) { - AbstractArchive.method5325(); - var68 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var68 >= 0) { - currentClanSettings[var68] = null; - } else { - class114.guestClanSettings = null; + String var53; + if (ServerPacket.field2865 == var1.serverPacket) { // L: 6070 + var17 = var3.method6997(); // L: 6071 + var5 = var3.method6996(); // L: 6072 + var53 = var3.readStringCp1252NullTerminated(); // L: 6073 + if (var17 >= 1 && var17 <= 8) { // L: 6074 + if (var53.equalsIgnoreCase("null")) { // L: 6075 + var53 = null; } - var1.serverPacket = null; - return true; + playerMenuActions[var17 - 1] = var53; // L: 6076 + playerOptionsPriorities[var17 - 1] = var5 == 0; // L: 6077 } - if (var68 >= 0) { - currentClanSettings[var68] = new ClanSettings(var3); - } else { - class114.guestClanSettings = new ClanSettings(var3); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2881 == var1.serverPacket) { - field594 = cycleCntr; - var68 = var3.readByte(); - class133 var73 = new class133(var3); - ClanChannel var77; - if (var68 >= 0) { - var77 = currentClanChannels[var68]; - } else { - var77 = GrandExchangeOfferNameComparator.guestClanChannel; - } - - var73.method2701(var77); - var1.serverPacket = null; - return true; - } - - boolean var64; - if (ServerPacket.field2847 == var1.serverPacket) { - var64 = var3.readUnsignedByte() == 1; - if (var64) { - class119.field1395 = UserComparator4.method2406() - var3.readLong(); - class6.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - class6.grandExchangeEvents = null; - } - - field489 = cycleCntr; - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6079 + return true; // L: 6080 } int var7; int var8; int var9; - if (ServerPacket.field2844 == var1.serverPacket) { - var17 = var3.method6933(); - var5 = var3.method6945(); - var6 = var17 >> 10 & 31; - var7 = var17 >> 5 & 31; - var8 = var17 & 31; - var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); - Widget var54 = HealthBarUpdate.getWidget(var5); - if (var9 != var54.color) { - var54.color = var9; - class16.invalidateWidget(var54); - } + int var10; + if (ServerPacket.field2806 == var1.serverPacket) { // L: 6082 + isCameraLocked = true; // L: 6083 + UrlRequest.field1298 = var3.readUnsignedByte(); // L: 6084 + SoundSystem.field288 = var3.readUnsignedByte(); // L: 6085 + ArchiveLoader.field985 = var3.readUnsignedShort(); // L: 6086 + class269.field3221 = var3.readUnsignedByte(); // L: 6087 + TextureProvider.field2484 = var3.readUnsignedByte(); // L: 6088 + if (TextureProvider.field2484 >= 100) { // L: 6089 + var17 = UrlRequest.field1298 * 128 + 64; // L: 6090 + var5 = SoundSystem.field288 * 128 + 64; // L: 6091 + var18 = class392.getTileHeight(var17, var5, GrandExchangeOfferTotalQuantityComparator.Client_plane) - ArchiveLoader.field985; // L: 6092 + var7 = var17 - WorldMapSectionType.cameraX; // L: 6093 + var8 = var18 - class174.cameraY; // L: 6094 + var9 = var5 - class65.cameraZ; // L: 6095 + var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); // L: 6096 + class121.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 6097 + WorldMapRegion.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 6098 + if (class121.cameraPitch < 128) { // L: 6099 + class121.cameraPitch = 128; + } - var1.serverPacket = null; - return true; - } - - String var76; - if (ServerPacket.field2861 == var1.serverPacket) { - byte[] var50 = new byte[var1.serverPacketLength]; - var3.method6853(var50, 0, var50.length); - Buffer var71 = new Buffer(var50); - var76 = var71.readStringCp1252NullTerminated(); - LoginScreenAnimation.openURL(var76, true, false); - var1.serverPacket = null; - return true; - } - - InterfaceParent var20; - if (ServerPacket.field2820 == var1.serverPacket) { - var17 = var3.method7059(); - var5 = var3.method6927(); - var6 = var3.method6876(); - var20 = (InterfaceParent)interfaceParents.get((long)var6); - if (var20 != null) { - WorldMapLabelSize.closeInterface(var20, var17 != var20.group); - } - - class4.method23(var6, var17, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2802 == var1.serverPacket) { - class295.method5382(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - Widget var21; - if (ServerPacket.field2794 == var1.serverPacket) { - var17 = var3.method6945(); - var5 = var3.method6933(); - var6 = var3.readUnsignedShort(); - var7 = var3.method7059(); - var21 = HealthBarUpdate.getWidget(var17); - if (var7 != var21.modelAngleX || var6 != var21.modelAngleY || var5 != var21.modelZoom) { - var21.modelAngleX = var7; - var21.modelAngleY = var6; - var21.modelZoom = var5; - class16.invalidateWidget(var21); - } - - var1.serverPacket = null; - return true; - } - - Widget var69; - if (ServerPacket.field2865 == var1.serverPacket) { - var17 = var3.method6945(); - var5 = var3.method6937(); - var6 = var3.method6936(); - var69 = HealthBarUpdate.getWidget(var17); - if (var6 != var69.rawX || var5 != var69.rawY || var69.xAlignment != 0 || var69.yAlignment != 0) { - var69.rawX = var6; - var69.rawY = var5; - var69.xAlignment = 0; - var69.yAlignment = 0; - class16.invalidateWidget(var69); - this.alignWidget(var69); - if (var69.type == 0) { - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var17 >> 16], var69, false); + if (class121.cameraPitch > 383) { // L: 6100 + class121.cameraPitch = 383; } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6102 + return true; // L: 6103 } - if (ServerPacket.field2853 == var1.serverPacket) { - class120.method2530(); - var17 = var3.method6927(); - var5 = var3.method6926(); - var6 = var3.method6876(); - experience[var17] = var6; - currentLevels[var17] = var5; - levels[var17] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var6 >= Skills.Skills_experienceTable[var7]) { - levels[var17] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var17; - var1.serverPacket = null; - return true; + if (ServerPacket.field2805 == var1.serverPacket) { // L: 6105 + ItemComposition.method3406(); // L: 6106 + weight = var3.readShort(); // L: 6107 + field494 = cycleCntr; // L: 6108 + var1.serverPacket = null; // L: 6109 + return true; // L: 6110 } - if (ServerPacket.field2815 == var1.serverPacket) { - WorldMapArea.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2828 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - class264.friendsChat = null; + if (ServerPacket.field2890 == var1.serverPacket) { // L: 6112 + var17 = var3.readUnsignedByte(); // L: 6113 + if (var3.readUnsignedByte() == 0) { // L: 6114 + grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6115 + var3.offset += 18; // L: 6116 } else { - if (class264.friendsChat == null) { - class264.friendsChat = new FriendsChat(WorldMapSectionType.loginType, class21.client); - } - - class264.friendsChat.readUpdate(var3); + --var3.offset; // L: 6119 + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6120 } - Archive.method5187(); - var1.serverPacket = null; - return true; + field536 = cycleCntr; // L: 6122 + var1.serverPacket = null; // L: 6123 + return true; // L: 6124 + } + + if (ServerPacket.field2804 == var1.serverPacket) { // L: 6126 + class21.method309(class240.field2772); // L: 6127 + var1.serverPacket = null; // L: 6128 + return true; // L: 6129 + } + + byte var61; + if (ServerPacket.field2802 == var1.serverPacket) { // L: 6131 + var61 = var3.readByte(); // L: 6132 + var5 = var3.method7120(); // L: 6133 + Varps.Varps_temp[var5] = var61; // L: 6134 + if (Varps.Varps_main[var5] != var61) { // L: 6135 + Varps.Varps_main[var5] = var61; // L: 6136 + } + + WorldMapLabelSize.changeGameOptions(var5); // L: 6138 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6139 + var1.serverPacket = null; // L: 6140 + return true; // L: 6141 + } + + if (ServerPacket.field2824 == var1.serverPacket) { // L: 6143 + class21.method309(class240.field2780); // L: 6144 + var1.serverPacket = null; // L: 6145 + return true; // L: 6146 + } + + if (ServerPacket.field2858 == var1.serverPacket) { // L: 6148 + var17 = var3.readUnsignedByte(); // L: 6149 + var5 = var3.readUnsignedByte(); // L: 6150 + var18 = var3.readUnsignedByte(); // L: 6151 + var7 = var3.readUnsignedByte(); // L: 6152 + field718[var17] = true; // L: 6153 + field719[var17] = var5; // L: 6154 + field598[var17] = var18; // L: 6155 + field721[var17] = var7; // L: 6156 + field722[var17] = 0; // L: 6157 + var1.serverPacket = null; // L: 6158 + return true; // L: 6159 } - long var12; int var15; - long var22; - long var24; - long var26; - String var28; - String var46; - if (ServerPacket.field2864 == var1.serverPacket) { - var46 = var3.readStringCp1252NullTerminated(); - var22 = var3.readLong(); - var24 = (long)var3.readUnsignedShort(); - var26 = (long)var3.readMedium(); - PlayerType var51 = (PlayerType)class128.findEnumerated(class19.PlayerType_values(), var3.readUnsignedByte()); - var12 = var26 + (var24 << 32); - boolean var57 = false; - - for (var15 = 0; var15 < 100; ++var15) { - if (crossWorldMessageIds[var15] == var12) { - var57 = true; - break; - } - } - - if (var51.isUser && Message.friendSystem.isIgnored(new Username(var46, WorldMapSectionType.loginType))) { - var57 = true; - } - - if (!var57 && field559 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var28 = AbstractFont.escapeBrackets(Tiles.method2025(SecureRandomFuture.method1951(var3))); - if (var51.modIcon != -1) { - Players.addChatMessage(9, ReflectionCheck.method1064(var51.modIcon) + var46, var28, FloorDecoration.base37DecodeLong(var22)); - } else { - Players.addChatMessage(9, var46, var28, FloorDecoration.base37DecodeLong(var22)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2845 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2773); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2824 == var1.serverPacket) { - var64 = var3.readBoolean(); - if (var64) { - if (Widget.field3165 == null) { - Widget.field3165 = new class300(); - } - } else { - Widget.field3165 = null; - } - - var1.serverPacket = null; - return true; - } - - Widget var19; - if (ServerPacket.field2799 == var1.serverPacket) { - var46 = var3.readStringCp1252NullTerminated(); - var5 = var3.readInt(); - var19 = HealthBarUpdate.getWidget(var5); - if (!var46.equals(var19.text)) { - var19.text = var46; - class16.invalidateWidget(var19); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2810 == var1.serverPacket) { - Coord.field3013 = null; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2839 == var1.serverPacket) { - var46 = var3.readStringCp1252NullTerminated(); - var18 = AbstractFont.escapeBrackets(Tiles.method2025(SecureRandomFuture.method1951(var3))); - GraphicsDefaults.addGameMessage(6, var46, var18); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2841 == var1.serverPacket) { - UrlRequest.field1313 = var3.method6927(); - WorldMapElement.field1622 = var3.method6926(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2859 == 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]; - NetSocket.changeGameOptions(var17); - changedVarps[++changedVarpCount - 1 & 31] = var17; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2852 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2772); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2829 == var1.serverPacket) { - if (class264.friendsChat != null) { - class264.friendsChat.method5971(var3); - } - - Archive.method5187(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2787 == var1.serverPacket) { - UrlRequest.field1313 = var3.method6926(); - WorldMapElement.field1622 = var3.readUnsignedByte(); - - for (var17 = UrlRequest.field1313; var17 < UrlRequest.field1313 + 8; ++var17) { - for (var5 = WorldMapElement.field1622; var5 < WorldMapElement.field1622 + 8; ++var5) { - if (groundItems[VertexNormal.Client_plane][var17][var5] != null) { - groundItems[VertexNormal.Client_plane][var17][var5] = null; - HealthBarUpdate.updateItemPile(var17, var5); - } - } - } - - for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { - if (var49.x >= UrlRequest.field1313 && var49.x < UrlRequest.field1313 + 8 && var49.y >= WorldMapElement.field1622 && var49.y < WorldMapElement.field1622 + 8 && var49.plane == VertexNormal.Client_plane) { - var49.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2866 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - class120.method2533(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2797 == var1.serverPacket) { - var17 = var3.method6934(); - rootInterface = var17; - this.resizeRoot(false); - class17.Widget_resetModelFrames(var17); - WorldMapScaleHandler.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field710[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2813 == var1.serverPacket) { - isCameraLocked = false; - - for (var17 = 0; var17 < 5; ++var17) { - field739[var17] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2879 == var1.serverPacket) { - var17 = var3.readUShortSmart(); - boolean var58 = var3.readUnsignedByte() == 1; - var76 = ""; - boolean var52 = false; - if (var58) { - var76 = var3.readStringCp1252NullTerminated(); - if (Message.friendSystem.isIgnored(new Username(var76, WorldMapSectionType.loginType))) { - var52 = true; - } - } - - String var75 = var3.readStringCp1252NullTerminated(); - if (!var52) { - GraphicsDefaults.addGameMessage(var17, var76, var75); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2869 == var1.serverPacket) { - Message.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - SceneTilePaint.FriendSystem_invalidateIgnoreds(); - field685 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2873 == var1.serverPacket) { - World var48 = new World(); - var48.host = var3.readStringCp1252NullTerminated(); - var48.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var48.properties = var5; - UserList.updateGameState(45); - var2.close(); - var2 = null; - World.changeWorld(var48); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2801 == var1.serverPacket) { - Message.friendSystem.method1651(); - field685 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2835 == var1.serverPacket) { - var68 = var3.readByte(); - var5 = var3.method6933(); - Varps.Varps_temp[var5] = var68; - if (Varps.Varps_main[var5] != var68) { - Varps.Varps_main[var5] = var68; - } - - NetSocket.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2877 == var1.serverPacket) { - AbstractByteArrayCopier.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2874 == var1.serverPacket) { - AttackOption.logOut(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2882 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2767); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2830 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2768); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2876 == var1.serverPacket) { - rebootTimer = var3.method6933() * 30; - field691 = cycleCntr; - var1.serverPacket = null; - return true; - } - - int var29; - if (ServerPacket.field2814 == var1.serverPacket) { - isCameraLocked = true; - Varcs.field1272 = var3.readUnsignedByte(); - World.field774 = var3.readUnsignedByte(); - class9.field44 = var3.readUnsignedShort(); - SequenceDefinition.field1954 = var3.readUnsignedByte(); - AbstractArchive.field3712 = var3.readUnsignedByte(); - if (AbstractArchive.field3712 >= 100) { - var17 = Varcs.field1272 * 128 + 64; - var5 = World.field774 * 128 + 64; - var6 = MidiPcmStream.getTileHeight(var17, var5, VertexNormal.Client_plane) - class9.field44; - var7 = var17 - Canvas.cameraX; - var8 = var6 - class14.cameraY; - var9 = var5 - VarpDefinition.cameraZ; - var29 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - WorldMapIcon_1.cameraPitch = (int)(Math.atan2((double)var8, (double)var29) * 325.949D) & 2047; - HealthBarUpdate.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (WorldMapIcon_1.cameraPitch < 128) { - WorldMapIcon_1.cameraPitch = 128; - } - - if (WorldMapIcon_1.cameraPitch > 383) { - WorldMapIcon_1.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2867 == var1.serverPacket) { - var17 = var3.method7059(); - var5 = var3.readInt(); - var19 = HealthBarUpdate.getWidget(var5); - if (var19.modelType != 1 || var17 != var19.modelId) { - var19.modelType = 1; - var19.modelId = var17; - class16.invalidateWidget(var19); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2849 == var1.serverPacket) { - WorldMapArea.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2791 == var1.serverPacket) { - Coord.field3013 = new class353(WorldMapIcon_1.HitSplatDefinition_cachedSprites); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2875 == var1.serverPacket) { - class120.method2530(); - runEnergy = var3.readUnsignedByte(); - field691 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2804 == var1.serverPacket) { - var17 = var3.method6945(); - var5 = var3.method6944(); - var6 = var3.readUnsignedShort(); - if (var6 == 65535) { - var6 = -1; - } - - var69 = HealthBarUpdate.getWidget(var5); - ItemComposition var74; - if (!var69.isIf3) { - if (var6 == -1) { - var69.modelType = 0; - var1.serverPacket = null; - return true; - } - - var74 = class87.ItemDefinition_get(var6); - var69.modelType = 4; - var69.modelId = var6; - var69.modelAngleX = var74.xan2d; - var69.modelAngleY = var74.yan2d; - var69.modelZoom = var74.zoom2d * 100 / var17; - class16.invalidateWidget(var69); - } else { - var69.itemId = var6; - var69.itemQuantity = var17; - var74 = class87.ItemDefinition_get(var6); - var69.modelAngleX = var74.xan2d; - var69.modelAngleY = var74.yan2d; - var69.modelAngleZ = var74.zan2d; - var69.modelOffsetX = var74.offsetX2d; - var69.modelOffsetY = var74.offsetY2d; - var69.modelZoom = var74.zoom2d; - if (var74.isStackable == 1) { - var69.itemQuantityMode = 1; - } else { - var69.itemQuantityMode = 2; - } - - if (var69.field3102 > 0) { - var69.modelZoom = var69.modelZoom * 32 / var69.field3102; - } else if (var69.rawWidth > 0) { - var69.modelZoom = var69.modelZoom * 32 / var69.rawWidth; - } - - class16.invalidateWidget(var69); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2834 == var1.serverPacket) { - var17 = var3.readInt(); - InterfaceParent var67 = (InterfaceParent)interfaceParents.get((long)var17); - if (var67 != null) { - WorldMapLabelSize.closeInterface(var67, true); - } - - if (meslayerContinueWidget != null) { - class16.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2872 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2775); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2806 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { - var5 += 32768; - } - - if (var17 >= 0) { - var19 = HealthBarUpdate.getWidget(var17); - } else { - var19 = null; - } - - for (; var3.offset < var1.serverPacketLength; class65.itemContainerSetItem(var5, var7, var8 - 1, var9)) { - var7 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var19 != null && var7 >= 0 && var7 < var19.itemIds.length) { - var19.itemIds[var7] = var8; - var19.itemQuantities[var7] = var9; - } - } - - if (var19 != null) { - class16.invalidateWidget(var19); - } - - class120.method2530(); - changedItemContainers[++field679 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2798 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2771); - var1.serverPacket = null; - return true; - } - - String var34; - int var56; - if (ServerPacket.field2846 == var1.serverPacket) { - var46 = var3.readStringCp1252NullTerminated(); - var22 = (long)var3.readUnsignedShort(); - var24 = (long)var3.readMedium(); - PlayerType var30 = (PlayerType)class128.findEnumerated(class19.PlayerType_values(), var3.readUnsignedByte()); - long var31 = (var22 << 32) + var24; - boolean var33 = false; - - for (var56 = 0; var56 < 100; ++var56) { - if (var31 == crossWorldMessageIds[var56]) { - var33 = true; - break; - } - } - - if (Message.friendSystem.isIgnored(new Username(var46, WorldMapSectionType.loginType))) { - var33 = true; - } - - if (!var33 && field559 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var31; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var34 = AbstractFont.escapeBrackets(Tiles.method2025(SecureRandomFuture.method1951(var3))); - byte var55; - if (var30.isPrivileged) { - var55 = 7; - } else { - var55 = 3; - } - - if (var30.modIcon != -1) { - GraphicsDefaults.addGameMessage(var55, ReflectionCheck.method1064(var30.modIcon) + var46, var34); - } else { - GraphicsDefaults.addGameMessage(var55, var46, var34); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2833 == var1.serverPacket) { - var68 = var3.readByte(); - var22 = (long)var3.readUnsignedShort(); - var24 = (long)var3.readMedium(); - var26 = (var22 << 32) + var24; - boolean var78 = false; - ClanChannel var36 = var68 >= 0 ? currentClanChannels[var68] : GrandExchangeOfferNameComparator.guestClanChannel; - if (var36 == null) { - var78 = true; - } else { - for (var56 = 0; var56 < 100; ++var56) { - if (var26 == crossWorldMessageIds[var56]) { - var78 = true; - break; - } - } - } - - if (!var78) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var26; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var34 = SecureRandomFuture.method1951(var3); - int var14 = var68 >= 0 ? 43 : 46; - Players.addChatMessage(var14, "", var34, var36.name); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2792 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readInt(); - var6 = Frames.getGcDuration(); - PacketBufferNode var72 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2732, packetWriter.isaacCipher); - var72.packetBuffer.method7117(var6); - var72.packetBuffer.method7066(GameEngine.fps); - var72.packetBuffer.writeIntME(var17); - var72.packetBuffer.method6940(var5); - packetWriter.addNode(var72); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2837 == var1.serverPacket) { - if (Coord.field3013 == null) { - Coord.field3013 = new class353(WorldMapIcon_1.HitSplatDefinition_cachedSprites); - } - - class408 var47 = WorldMapIcon_1.HitSplatDefinition_cachedSprites.method6309(var3); - Coord.field3013.field4042.vmethod6669(var47.field4354, var47.field4353); - field682[++field683 - 1 & 31] = var47.field4354; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2818 == var1.serverPacket) { - class120.method2530(); - weight = var3.readShort(); - field691 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2860 == var1.serverPacket) { - class14.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2823 == var1.serverPacket) { - if (rootInterface != -1) { - ItemContainer.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2843 == var1.serverPacket) { - var17 = var3.method6945(); - var5 = var3.method6934(); - var19 = HealthBarUpdate.getWidget(var17); - if (var19 != null && var19.type == 0) { - if (var5 > var19.scrollHeight - var19.height) { - var5 = var19.scrollHeight - var19.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var19.scrollY) { - var19.scrollY = var5; - class16.invalidateWidget(var19); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2805 == var1.serverPacket) { - Message.friendSystem.readUpdate(var3, var1.serverPacketLength); - field685 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2819 == var1.serverPacket) { - var68 = var3.readByte(); - var18 = var3.readStringCp1252NullTerminated(); - long var37 = (long)var3.readUnsignedShort(); - long var39 = (long)var3.readMedium(); - PlayerType var53 = (PlayerType)class128.findEnumerated(class19.PlayerType_values(), var3.readUnsignedByte()); - long var41 = (var37 << 32) + var39; - boolean var13 = false; - ClanChannel var43 = null; - var43 = var68 >= 0 ? currentClanChannels[var68] : GrandExchangeOfferNameComparator.guestClanChannel; - if (var43 == null) { - var13 = true; + String var25; + if (ServerPacket.field2878 == var1.serverPacket) { // L: 6161 + var61 = var3.readByte(); // L: 6162 + var19 = var3.readStringCp1252NullTerminated(); // L: 6163 + long var20 = (long)var3.readUnsignedShort(); // L: 6164 + long var22 = (long)var3.readMedium(); // L: 6165 + PlayerType var70 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6166 + long var11 = var22 + (var20 << 32); // L: 6167 + boolean var58 = false; // L: 6168 + ClanChannel var14 = null; // L: 6169 + var14 = var61 >= 0 ? currentClanChannels[var61] : class115.guestClanChannel; // L: 6171 + if (var14 == null) { // L: 6172 + var58 = true; // L: 6173 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var53.isUser && Message.friendSystem.isIgnored(new Username(var18, WorldMapSectionType.loginType))) { - var13 = true; + if (var70.isUser && class112.friendSystem.isIgnored(new Username(var19, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6182 6183 + var58 = true; } break; } - if (var41 == crossWorldMessageIds[var15]) { - var13 = true; - break; + if (var11 == crossWorldMessageIds[var15]) { // L: 6177 + var58 = true; // L: 6178 + break; // L: 6179 } - ++var15; + ++var15; // L: 6176 } } - if (!var13) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var28 = AbstractFont.escapeBrackets(SecureRandomFuture.method1951(var3)); - int var16 = var68 >= 0 ? 41 : 44; - if (var53.modIcon != -1) { - Players.addChatMessage(var16, ReflectionCheck.method1064(var53.modIcon) + var18, var28, var43.name); + if (!var58) { // L: 6186 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6187 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6188 + var25 = AbstractFont.escapeBrackets(MilliClock.method2955(var3)); // L: 6189 + int var16 = var61 >= 0 ? 41 : 44; // L: 6190 + if (var70.modIcon != -1) { // L: 6191 + class269.addChatMessage(var16, SpriteMask.method4998(var70.modIcon) + var19, var25, var14.name); } else { - Players.addChatMessage(var16, var18, var28, var43.name); + class269.addChatMessage(var16, var19, var25, var14.name); // L: 6192 } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6194 + return true; // L: 6195 } - if (ServerPacket.field2790 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var17] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.field2864 == var1.serverPacket) { // L: 6197 + if (rootInterface != -1) { // L: 6198 + ItemComposition.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 6199 + return true; // L: 6200 + } + + if (ServerPacket.field2849 == var1.serverPacket) { // L: 6202 + class21.method309(class240.field2773); // L: 6203 + var1.serverPacket = null; // L: 6204 + return true; // L: 6205 + } + + if (ServerPacket.field2883 == var1.serverPacket) { // L: 6207 + var17 = var3.method7004(); // L: 6208 + ClanSettings.method2714(var17); // L: 6209 + changedItemContainers[++field659 - 1 & 31] = var17 & 32767; // L: 6210 + var1.serverPacket = null; // L: 6211 + return true; // L: 6212 + } + + int var13; + long var26; + long var28; + String var33; + String var47; + if (ServerPacket.field2838 == var1.serverPacket) { // L: 6214 + var47 = var3.readStringCp1252NullTerminated(); // L: 6215 + var26 = (long)var3.readUnsignedShort(); // L: 6216 + var28 = (long)var3.readMedium(); // L: 6217 + PlayerType var30 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6218 + long var31 = (var26 << 32) + var28; // L: 6219 + boolean var12 = false; // L: 6220 + + for (var13 = 0; var13 < 100; ++var13) { // L: 6221 + if (crossWorldMessageIds[var13] == var31) { // L: 6222 + var12 = true; // L: 6223 + break; // L: 6224 + } + } + + if (class112.friendSystem.isIgnored(new Username(var47, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6227 + var12 = true; + } + + if (!var12 && field539 == 0) { // L: 6228 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var31; // L: 6229 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6230 + var33 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6231 + byte var72; + if (var30.isPrivileged) { // L: 6233 + var72 = 7; + } else { + var72 = 3; // L: 6234 + } + + if (var30.modIcon != -1) { // L: 6235 + class397.addGameMessage(var72, SpriteMask.method4998(var30.modIcon) + var47, var33); + } else { + class397.addGameMessage(var72, var47, var33); // L: 6236 + } + } + + var1.serverPacket = null; // L: 6238 + return true; // L: 6239 + } + + if (ServerPacket.field2884 == var1.serverPacket) { // L: 6241 + field724 = cycleCntr; // L: 6242 + var61 = var3.readByte(); // L: 6243 + class133 var67 = new class133(var3); // L: 6244 + ClanChannel var57; + if (var61 >= 0) { // L: 6246 + var57 = currentClanChannels[var61]; } else { - --var3.offset; - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); + var57 = class115.guestClanChannel; // L: 6247 } - field577 = cycleCntr; - var1.serverPacket = null; - return true; + var67.method2777(var57); // L: 6248 + var1.serverPacket = null; // L: 6249 + return true; // L: 6250 } - if (ServerPacket.field2816 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; + if (ServerPacket.field2888 == var1.serverPacket) { // L: 6252 + Players.field1254 = true; // L: 6253 + class16.updateNpcs(true, var3); // L: 6254 + var1.serverPacket = null; // L: 6255 + return true; // L: 6256 } - if (ServerPacket.field2826 == var1.serverPacket) { - var17 = var3.method6934(); - if (var17 == 65535) { - var17 = -1; + if (ServerPacket.field2811 == var1.serverPacket) { // L: 6258 + class16.updateNpcs(false, var3); // L: 6259 + var1.serverPacket = null; // L: 6260 + return true; // L: 6261 + } + + Widget var52; + if (ServerPacket.field2818 == var1.serverPacket) { // L: 6263 + var17 = var3.readInt(); // L: 6264 + var5 = var3.readUnsignedShort(); // L: 6265 + var52 = UserComparator9.getWidget(var17); // L: 6266 + if (var52.modelType != 2 || var5 != var52.modelId) { // L: 6267 + var52.modelType = 2; // L: 6268 + var52.modelId = var5; // L: 6269 + class184.invalidateWidget(var52); // L: 6270 } - WorldMapSprite.playSong(var17); - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6272 + return true; // L: 6273 } - if (ServerPacket.field2811 == var1.serverPacket) { - var17 = var3.method6934(); - if (var17 == 65535) { - var17 = -1; + if (ServerPacket.field2803 == var1.serverPacket) { // L: 6275 + var17 = var3.readInt(); // L: 6276 + var5 = var3.readUnsignedShort(); // L: 6277 + if (var17 < -70000) { // L: 6278 + var5 += 32768; } - var5 = var3.method6939(); - PcmPlayer.method741(var17, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2840 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var76 = var3.readStringCp1252NullTerminated(); - if (var17 >= 1 && var17 <= 8) { - if (var76.equalsIgnoreCase("null")) { - var76 = null; - } - - playerMenuActions[var17 - 1] = var76; - playerOptionsPriorities[var17 - 1] = var5 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2827 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2770); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2831 == var1.serverPacket) { - var17 = var3.method6933(); - PacketBufferNode.method4653(var17); - changedItemContainers[++field679 - 1 & 31] = var17 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2880 == var1.serverPacket) { - field594 = cycleCntr; - var68 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var68 >= 0) { - currentClanChannels[var68] = null; - } else { - GrandExchangeOfferNameComparator.guestClanChannel = null; - } - - var1.serverPacket = null; - return true; - } - - if (var68 >= 0) { - currentClanChannels[var68] = new ClanChannel(var3); + if (var17 >= 0) { // L: 6280 + var52 = UserComparator9.getWidget(var17); } else { - GrandExchangeOfferNameComparator.guestClanChannel = new ClanChannel(var3); + var52 = null; // L: 6281 } - var1.serverPacket = null; - return true; - } + for (; var3.offset < var1.serverPacketLength; DynamicObject.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6282 6296 + var7 = var3.readUShortSmart(); // L: 6283 + var8 = var3.readUnsignedShort(); // L: 6284 + var9 = 0; // L: 6285 + if (var8 != 0) { // L: 6286 + var9 = var3.readUnsignedByte(); // L: 6287 + if (var9 == 255) { // L: 6288 + var9 = var3.readInt(); + } + } - if (ServerPacket.field2789 == var1.serverPacket) { - var17 = var3.method6944(); - var63 = HealthBarUpdate.getWidget(var17); - var63.modelType = 3; - var63.modelId = class67.localPlayer.appearance.getChatHeadId(); - class16.invalidateWidget(var63); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2858 == var1.serverPacket) { - var17 = var3.readInt(); - if (var17 != field572) { - field572 = var17; - HealthBar.method2221(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2795 == var1.serverPacket) { - ClientPreferences.updatePlayers(var3, var1.serverPacketLength); - class17.method266(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2854 == var1.serverPacket) { - for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { - VarpDefinition var62 = ApproximateRouteStrategy.VarpDefinition_get(var17); - if (var62 != null) { - Varps.Varps_temp[var17] = 0; - Varps.Varps_main[var17] = 0; + if (var52 != null && var7 >= 0 && var7 < var52.itemIds.length) { // L: 6290 6291 + var52.itemIds[var7] = var8; // L: 6292 + var52.itemQuantities[var7] = var9; // L: 6293 } } - class120.method2530(); - changedVarpCount += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2850 == var1.serverPacket) { - var17 = var3.method6937(); - var5 = var3.method6944(); - var19 = HealthBarUpdate.getWidget(var5); - if (var17 != var19.sequenceId || var17 == -1) { - var19.sequenceId = var17; - var19.modelFrame = 0; - var19.modelFrameCycle = 0; - class16.invalidateWidget(var19); + if (var52 != null) { // L: 6298 + class184.invalidateWidget(var52); } - var1.serverPacket = null; - return true; + ItemComposition.method3406(); // L: 6299 + changedItemContainers[++field659 - 1 & 31] = var5 & 32767; // L: 6300 + var1.serverPacket = null; // L: 6301 + return true; // L: 6302 } - if (ServerPacket.field2808 == var1.serverPacket) { - class14.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2832 == var1.serverPacket) { - var17 = var3.method6933(); - var5 = var3.method6944(); - var19 = HealthBarUpdate.getWidget(var5); - if (var19.modelType != 2 || var17 != var19.modelId) { - var19.modelType = 2; - var19.modelId = var17; - class16.invalidateWidget(var19); + if (ServerPacket.field2843 == var1.serverPacket) { // L: 6304 + var17 = var3.method7044(); // L: 6305 + var5 = var3.method7006(); // L: 6306 + var18 = var5 >> 10 & 31; // L: 6307 + var7 = var5 >> 5 & 31; // L: 6308 + var8 = var5 & 31; // L: 6309 + var9 = (var7 << 11) + (var18 << 19) + (var8 << 3); // L: 6310 + Widget var69 = UserComparator9.getWidget(var17); // L: 6311 + if (var9 != var69.color) { // L: 6312 + var69.color = var9; // L: 6313 + class184.invalidateWidget(var69); // L: 6314 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6316 + return true; // L: 6317 } - if (ServerPacket.field2855 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2769); - var1.serverPacket = null; - return true; + if (ServerPacket.field2892 == var1.serverPacket) { // L: 6319 + Players.field1254 = true; // L: 6320 + class16.updateNpcs(false, var3); // L: 6321 + var1.serverPacket = null; // L: 6322 + return true; // L: 6323 } - if (ServerPacket.field2868 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - class184.queueSoundEffect(var17, var5, var6); - var1.serverPacket = null; - return true; + if (ServerPacket.field2859 == var1.serverPacket) { // L: 6325 + byte[] var50 = new byte[var1.serverPacketLength]; // L: 6326 + var3.method6939(var50, 0, var50.length); // L: 6327 + Buffer var66 = new Buffer(var50); // L: 6328 + var53 = var66.readStringCp1252NullTerminated(); // L: 6329 + class91.openURL(var53, true, false); // L: 6330 + var1.serverPacket = null; // L: 6331 + return true; // L: 6332 } - if (ServerPacket.field2793 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2776); - var1.serverPacket = null; - return true; + if (ServerPacket.field2833 == var1.serverPacket) { // L: 6334 + isCameraLocked = true; // L: 6335 + SpotAnimationDefinition.field1761 = var3.readUnsignedByte(); // L: 6336 + BuddyRankComparator.field1333 = var3.readUnsignedByte(); // L: 6337 + Renderable.field2442 = var3.readUnsignedShort(); // L: 6338 + UserComparator8.field1305 = var3.readUnsignedByte(); // L: 6339 + Login.field888 = var3.readUnsignedByte(); // L: 6340 + if (Login.field888 >= 100) { // L: 6341 + WorldMapSectionType.cameraX = SpotAnimationDefinition.field1761 * 128 + 64; // L: 6342 + class65.cameraZ = BuddyRankComparator.field1333 * 128 + 64; // L: 6343 + class174.cameraY = class392.getTileHeight(WorldMapSectionType.cameraX, class65.cameraZ, GrandExchangeOfferTotalQuantityComparator.Client_plane) - Renderable.field2442; // L: 6344 + } + + var1.serverPacket = null; // L: 6346 + return true; // L: 6347 } - if (ServerPacket.field2863 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - var5 = var3.method6933(); - var6 = var3.method6876(); - var69 = HealthBarUpdate.getWidget(var6); - var69.field3038 = var17 + (var5 << 16); - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2826 == var1.serverPacket) { // L: 6349 + var17 = var3.method7015(); // L: 6350 + var5 = var3.method7004(); // L: 6351 + var52 = UserComparator9.getWidget(var17); // L: 6352 + if (var52 != null && var52.type == 0) { // L: 6353 + if (var5 > var52.scrollHeight - var52.height) { // L: 6354 + var5 = var52.scrollHeight - var52.height; + } - if (ServerPacket.field2838 == var1.serverPacket) { - publicChatMode = var3.method6927(); - tradeChatMode = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } + if (var5 < 0) { // L: 6355 + var5 = 0; + } - if (ServerPacket.field2817 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - class322.method5894(var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2848 == var1.serverPacket) { - var17 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class17.Widget_resetModelFrames(rootInterface); - WorldMapScaleHandler.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field710[var7] = true; + if (var5 != var52.scrollY) { // L: 6356 + var52.scrollY = var5; // L: 6357 + class184.invalidateWidget(var52); // L: 6358 } } - InterfaceParent var10; - for (; var6-- > 0; var10.field1031 = true) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var10 = (InterfaceParent)interfaceParents.get((long)var7); - if (var10 != null && var8 != var10.group) { - WorldMapLabelSize.closeInterface(var10, true); - var10 = null; - } + var1.serverPacket = null; // L: 6361 + return true; // L: 6362 + } - if (var10 == null) { - var10 = class4.method23(var7, var8, var9); - } + if (ServerPacket.field2797 == var1.serverPacket) { // L: 6364 + var17 = var3.readUnsignedByte(); // L: 6365 + CollisionMap.forceDisconnect(var17); // L: 6366 + var1.serverPacket = null; // L: 6367 + return false; // L: 6368 + } + + if (ServerPacket.field2841 == var1.serverPacket) { // L: 6370 + ItemComposition.method3406(); // L: 6371 + runEnergy = var3.readUnsignedByte(); // L: 6372 + field494 = cycleCntr; // L: 6373 + var1.serverPacket = null; // L: 6374 + return true; // L: 6375 + } + + if (ServerPacket.field2875 == var1.serverPacket) { // L: 6377 + ApproximateRouteStrategy.privateChatMode = FloorDecoration.method4189(var3.readUnsignedByte()); // L: 6378 + var1.serverPacket = null; // L: 6379 + return true; // L: 6380 + } + + if (ServerPacket.field2845 == var1.serverPacket) { // L: 6382 + var47 = var3.readStringCp1252NullTerminated(); // L: 6383 + var5 = var3.method7021(); // L: 6384 + var52 = UserComparator9.getWidget(var5); // L: 6385 + if (!var47.equals(var52.text)) { // L: 6386 + var52.text = var47; // L: 6387 + class184.invalidateWidget(var52); // L: 6388 } - for (var20 = (InterfaceParent)interfaceParents.first(); var20 != null; var20 = (InterfaceParent)interfaceParents.next()) { - if (var20.field1031) { - var20.field1031 = false; + var1.serverPacket = null; // L: 6390 + return true; // L: 6391 + } + + if (ServerPacket.field2874 == var1.serverPacket) { // L: 6393 + Canvas.loadRegions(true, var1.packetBuffer); // L: 6394 + var1.serverPacket = null; // L: 6395 + return true; // L: 6396 + } + + if (ServerPacket.field2861 == var1.serverPacket) { // L: 6398 + rebootTimer = var3.method7120() * 30; // L: 6399 + field494 = cycleCntr; // L: 6400 + var1.serverPacket = null; // L: 6401 + return true; // L: 6402 + } + + if (ServerPacket.field2813 == var1.serverPacket) { // L: 6404 + var3.offset += 28; // L: 6405 + if (var3.checkCrc()) { // L: 6406 + class274.method5198(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6407 + return true; // L: 6408 + } + + if (ServerPacket.field2853 == var1.serverPacket) { // L: 6410 + CollisionMap.readReflectionCheck(var3, var1.serverPacketLength); // L: 6411 + var1.serverPacket = null; // L: 6412 + return true; // L: 6413 + } + + if (ServerPacket.field2820 == var1.serverPacket) { // L: 6415 + var47 = var3.readStringCp1252NullTerminated(); // L: 6416 + Object[] var65 = new Object[var47.length() + 1]; // L: 6417 + + for (var18 = var47.length() - 1; var18 >= 0; --var18) { // L: 6418 + if (var47.charAt(var18) == 's') { // L: 6419 + var65[var18 + 1] = var3.readStringCp1252NullTerminated(); } else { - WorldMapLabelSize.closeInterface(var20, true); + var65[var18 + 1] = new Integer(var3.readInt()); // L: 6420 } } - widgetFlags = new NodeHashTable(512); - - while (var3.offset < var17) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var29 = var3.readInt(); - - for (int var35 = var8; var35 <= var9; ++var35) { - var12 = ((long)var7 << 32) + (long)var35; - widgetFlags.put(new IntegerNode(var29), var12); - } - } - - var1.serverPacket = null; - return true; + var65[0] = new Integer(var3.readInt()); // L: 6422 + ScriptEvent var54 = new ScriptEvent(); // L: 6423 + var54.args = var65; // L: 6424 + Tile.runScriptEvent(var54); // L: 6425 + var1.serverPacket = null; // L: 6426 + return true; // L: 6427 } - if (ServerPacket.field2856 == var1.serverPacket) { - var17 = var3.method6876(); - var5 = var3.method6934(); - if (var5 == 65535) { - var5 = -1; + boolean var56; + if (ServerPacket.field2854 == var1.serverPacket) { // L: 6429 + var17 = var3.method7044(); // L: 6430 + var56 = var3.readUnsignedByte() == 1; // L: 6431 + var52 = UserComparator9.getWidget(var17); // L: 6432 + if (var56 != var52.isHidden) { // L: 6433 + var52.isHidden = var56; // L: 6434 + class184.invalidateWidget(var52); // L: 6435 } - var6 = var3.readInt(); - var7 = var3.method6933(); - if (var7 == 65535) { - var7 = -1; - } - - for (var8 = var5; var8 <= var7; ++var8) { - var26 = ((long)var6 << 32) + (long)var8; - Node var11 = widgetFlags.get(var26); - if (var11 != null) { - var11.remove(); - } - - widgetFlags.put(new IntegerNode(var17), var26); - } - - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6437 + return true; // L: 6438 } - if (ServerPacket.field2800 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); + if (ServerPacket.field2852 == var1.serverPacket) { // L: 6440 + var17 = var3.readInt(); // L: 6441 + var5 = var3.method7004(); // L: 6442 + var52 = UserComparator9.getWidget(var17); // L: 6443 + if (var52.modelType != 1 || var5 != var52.modelId) { // L: 6444 + var52.modelType = 1; // L: 6445 + var52.modelId = var5; // L: 6446 + class184.invalidateWidget(var52); // L: 6447 } - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 64; - hintArrowSubY = 64; - } - - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } - - if (hintArrowType == 4) { - hintArrowSubX = 128; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 64; - hintArrowSubY = 0; - } - - if (hintArrowType == 6) { - hintArrowSubX = 64; - hintArrowSubY = 128; - } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte(); - } - - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6449 + return true; // L: 6450 } - if (ServerPacket.field2857 == var1.serverPacket) { - AbstractArchive.method5325(); - var68 = var3.readByte(); - class119 var61 = new class119(var3); - ClanSettings var70; - if (var68 >= 0) { - var70 = currentClanSettings[var68]; + if (ServerPacket.field2836 == var1.serverPacket) { // L: 6452 + Actor.field1146 = var3.method6995(); // L: 6453 + ItemComposition.field1931 = var3.readUnsignedByte(); // L: 6454 + + for (var17 = ItemComposition.field1931; var17 < ItemComposition.field1931 + 8; ++var17) { // L: 6455 + for (var5 = Actor.field1146; var5 < Actor.field1146 + 8; ++var5) { // L: 6456 + if (groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var17][var5] != null) { // L: 6457 + groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var17][var5] = null; // L: 6458 + WallDecoration.updateItemPile(var17, var5); // L: 6459 + } + } + } + + for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { // L: 6463 6464 6466 + if (var49.x >= ItemComposition.field1931 && var49.x < ItemComposition.field1931 + 8 && var49.y >= Actor.field1146 && var49.y < Actor.field1146 + 8 && var49.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 6465 + var49.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6468 + return true; // L: 6469 + } + + if (ServerPacket.field2870 == var1.serverPacket) { // L: 6471 + SequenceDefinition.logOut(); // L: 6472 + var1.serverPacket = null; // L: 6473 + return false; // L: 6474 + } + + if (ServerPacket.field2856 == var1.serverPacket) { // L: 6476 + class112.friendSystem.method1746(); // L: 6477 + field679 = cycleCntr; // L: 6478 + var1.serverPacket = null; // L: 6479 + return true; // L: 6480 + } + + if (ServerPacket.field2871 == var1.serverPacket) { // L: 6482 + var17 = var3.readUnsignedShort(); // L: 6483 + var5 = var3.readUnsignedByte(); // L: 6484 + var18 = var3.readUnsignedShort(); // L: 6485 + class128.queueSoundEffect(var17, var5, var18); // L: 6486 + var1.serverPacket = null; // L: 6487 + return true; // L: 6488 + } + + if (ServerPacket.field2793 == var1.serverPacket) { // L: 6490 + isCameraLocked = false; // L: 6491 + + for (var17 = 0; var17 < 5; ++var17) { // L: 6492 + field718[var17] = false; + } + + var1.serverPacket = null; // L: 6493 + return true; // L: 6494 + } + + if (ServerPacket.field2844 == var1.serverPacket) { // L: 6496 + for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { // L: 6497 + VarpDefinition var64 = ArchiveLoader.VarpDefinition_get(var17); // L: 6498 + if (var64 != null) { // L: 6499 + Varps.Varps_temp[var17] = 0; // L: 6500 + Varps.Varps_main[var17] = 0; // L: 6501 + } + } + + ItemComposition.method3406(); // L: 6504 + changedVarpCount += 32; // L: 6505 + var1.serverPacket = null; // L: 6506 + return true; // L: 6507 + } + + InterfaceParent var35; + if (ServerPacket.field2809 == var1.serverPacket) { // L: 6509 + var17 = var3.method7006(); // L: 6510 + var5 = var3.method7015(); // L: 6511 + var18 = var3.method6995(); // L: 6512 + var35 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6513 + if (var35 != null) { // L: 6514 + Players.closeInterface(var35, var17 != var35.group); + } + + DynamicObject.method1997(var5, var17, var18); // L: 6515 + var1.serverPacket = null; // L: 6516 + return true; // L: 6517 + } + + if (ServerPacket.field2847 == var1.serverPacket) { // L: 6519 + class21.method309(class240.field2781); // L: 6520 + var1.serverPacket = null; // L: 6521 + return true; // L: 6522 + } + + if (ServerPacket.field2846 == var1.serverPacket) { // L: 6524 + var17 = var3.readInt(); // L: 6525 + var5 = var3.readUnsignedShort(); // L: 6526 + if (var17 < -70000) { // L: 6527 + var5 += 32768; + } + + if (var17 >= 0) { // L: 6529 + var52 = UserComparator9.getWidget(var17); } else { - var70 = class114.guestClanSettings; + var52 = null; // L: 6530 } - var61.method2522(var70); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2812 == var1.serverPacket) { - WorldMapElement.field1622 = var3.method6926(); - UrlRequest.field1313 = var3.method6927(); - - while (var3.offset < var1.serverPacketLength) { - var17 = var3.readUnsignedByte(); - class240 var60 = ClientPreferences.method2209()[var17]; - HealthBarDefinition.method2981(var60); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2796 == var1.serverPacket) { - var64 = var3.method6926() == 1; - var5 = var3.method6944(); - var19 = HealthBarUpdate.getWidget(var5); - if (var64 != var19.isHidden) { - var19.isHidden = var64; - class16.invalidateWidget(var19); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2803 == var1.serverPacket) { - var46 = var3.readStringCp1252NullTerminated(); - Object[] var59 = new Object[var46.length() + 1]; - - for (var6 = var46.length() - 1; var6 >= 0; --var6) { - if (var46.charAt(var6) == 's') { - var59[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var59[var6 + 1] = new Integer(var3.readInt()); + if (var52 != null) { // L: 6531 + for (var7 = 0; var7 < var52.itemIds.length; ++var7) { // L: 6532 + var52.itemIds[var7] = 0; // L: 6533 + var52.itemQuantities[var7] = 0; // L: 6534 } } - var59[0] = new Integer(var3.readInt()); - ScriptEvent var66 = new ScriptEvent(); - var66.args = var59; - ViewportMouse.runScriptEvent(var66); - var1.serverPacket = null; - return true; + class20.clearItemContainer(var5); // L: 6537 + var7 = var3.readUnsignedShort(); // L: 6538 + + for (var8 = 0; var8 < var7; ++var8) { // L: 6539 + var9 = var3.method6996(); // L: 6540 + if (var9 == 255) { // L: 6541 + var9 = var3.method7015(); + } + + var10 = var3.method7004(); // L: 6542 + if (var52 != null && var8 < var52.itemIds.length) { // L: 6543 6544 + var52.itemIds[var8] = var10; // L: 6545 + var52.itemQuantities[var8] = var9; // L: 6546 + } + + DynamicObject.itemContainerSetItem(var5, var8, var10 - 1, var9); // L: 6549 + } + + if (var52 != null) { // L: 6551 + class184.invalidateWidget(var52); + } + + ItemComposition.method3406(); // L: 6552 + changedItemContainers[++field659 - 1 & 31] = var5 & 32767; // L: 6553 + var1.serverPacket = null; // L: 6554 + return true; // L: 6555 } - if (ServerPacket.field2878 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field739[var17] = true; - field740[var17] = var5; - field741[var17] = var6; - field742[var17] = var7; - field743[var17] = 0; - var1.serverPacket = null; - return true; + if (ServerPacket.field2860 == var1.serverPacket) { // L: 6557 + var17 = var3.readUShortSmart(); // L: 6558 + var56 = var3.readUnsignedByte() == 1; // L: 6559 + var53 = ""; // L: 6560 + boolean var55 = false; // L: 6561 + if (var56) { // L: 6562 + var53 = var3.readStringCp1252NullTerminated(); // L: 6563 + if (class112.friendSystem.isIgnored(new Username(var53, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6564 + var55 = true; + } + } + + String var76 = var3.readStringCp1252NullTerminated(); // L: 6566 + if (!var55) { // L: 6567 + class397.addGameMessage(var17, var53, var76); + } + + var1.serverPacket = null; // L: 6568 + return true; // L: 6569 } - if (ServerPacket.field2822 == var1.serverPacket) { - for (var17 = 0; var17 < players.length; ++var17) { - if (players[var17] != null) { + if (ServerPacket.field2839 == var1.serverPacket) { // L: 6571 + Canvas.loadRegions(false, var1.packetBuffer); // L: 6572 + var1.serverPacket = null; // L: 6573 + return true; // L: 6574 + } + + if (ServerPacket.field2885 == var1.serverPacket) { // L: 6576 + ItemComposition.field1931 = var3.method6995(); // L: 6577 + Actor.field1146 = var3.readUnsignedByte(); // L: 6578 + + while (var3.offset < var1.serverPacketLength) { // L: 6579 + var17 = var3.readUnsignedByte(); // L: 6580 + class240 var63 = class130.method2748()[var17]; // L: 6581 + class21.method309(var63); // L: 6582 + } + + var1.serverPacket = null; // L: 6584 + return true; // L: 6585 + } + + if (ServerPacket.field2796 == var1.serverPacket) { // L: 6587 + class128.method2728(var3.readStringCp1252NullTerminated()); // L: 6588 + var1.serverPacket = null; // L: 6589 + return true; // L: 6590 + } + + if (ServerPacket.field2812 == var1.serverPacket) { // L: 6592 + class21.method309(class240.field2782); // L: 6593 + var1.serverPacket = null; // L: 6594 + return true; // L: 6595 + } + + Widget var73; + if (ServerPacket.field2842 == var1.serverPacket) { // L: 6597 + var17 = var3.method7120(); // L: 6598 + var5 = var3.method7004(); // L: 6599 + var18 = var3.method7021(); // L: 6600 + var73 = UserComparator9.getWidget(var18); // L: 6601 + var73.field3165 = var5 + (var17 << 16); // L: 6602 + var1.serverPacket = null; // L: 6603 + return true; // L: 6604 + } + + if (ServerPacket.field2834 == var1.serverPacket) { // L: 6606 + var17 = var3.readInt(); // L: 6607 + var5 = var3.readInt(); // L: 6608 + var18 = Occluder.getGcDuration(); // L: 6609 + PacketBufferNode var75 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2680, packetWriter.isaacCipher); // L: 6611 + var75.packetBuffer.writeByte(GameEngine.fps); // L: 6612 + var75.packetBuffer.method7126(var17); // L: 6613 + var75.packetBuffer.method7126(var5); // L: 6614 + var75.packetBuffer.method6947(var18); // L: 6615 + packetWriter.addNode(var75); // L: 6616 + var1.serverPacket = null; // L: 6617 + return true; // L: 6618 + } + + boolean var68; + if (ServerPacket.field2821 == var1.serverPacket) { // L: 6620 + var68 = var3.readUnsignedByte() == 1; // L: 6621 + if (var68) { // L: 6622 + GrandExchangeOfferUnitPriceComparator.field3758 = class111.method2516() - var3.readLong(); // L: 6623 + JagexCache.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6624 + } else { + JagexCache.grandExchangeEvents = null; // L: 6626 + } + + field670 = cycleCntr; // L: 6627 + var1.serverPacket = null; // L: 6628 + return true; // L: 6629 + } + + if (ServerPacket.field2850 == var1.serverPacket) { // L: 6631 + var17 = var3.method7008(); // L: 6632 + var5 = var3.method7044(); // L: 6633 + var52 = UserComparator9.getWidget(var5); // L: 6634 + if (var17 != var52.sequenceId || var17 == -1) { // L: 6635 + var52.sequenceId = var17; // L: 6636 + var52.modelFrame = 0; // L: 6637 + var52.modelFrameCycle = 0; // L: 6638 + class184.invalidateWidget(var52); // L: 6639 + } + + var1.serverPacket = null; // L: 6641 + return true; // L: 6642 + } + + long var37; + if (ServerPacket.field2827 == var1.serverPacket) { // L: 6644 + var61 = var3.readByte(); // L: 6645 + var26 = (long)var3.readUnsignedShort(); // L: 6646 + var28 = (long)var3.readMedium(); // L: 6647 + var37 = var28 + (var26 << 32); // L: 6648 + boolean var77 = false; // L: 6649 + ClanChannel var40 = var61 >= 0 ? currentClanChannels[var61] : class115.guestClanChannel; // L: 6650 + if (var40 == null) { // L: 6651 + var77 = true; + } else { + for (var13 = 0; var13 < 100; ++var13) { // L: 6653 + if (crossWorldMessageIds[var13] == var37) { // L: 6654 + var77 = true; // L: 6655 + break; // L: 6656 + } + } + } + + if (!var77) { // L: 6660 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var37; // L: 6661 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6662 + var33 = MilliClock.method2955(var3); // L: 6663 + int var71 = var61 >= 0 ? 43 : 46; // L: 6664 + class269.addChatMessage(var71, "", var33, var40.name); // L: 6665 + } + + var1.serverPacket = null; // L: 6667 + return true; // L: 6668 + } + + if (ServerPacket.field2868 == var1.serverPacket) { // L: 6670 + for (var17 = 0; var17 < players.length; ++var17) { // L: 6671 + if (players[var17] != null) { // L: 6672 players[var17].sequence = -1; } } - for (var17 = 0; var17 < npcs.length; ++var17) { - if (npcs[var17] != null) { + for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6674 + if (npcs[var17] != null) { // L: 6675 npcs[var17].sequence = -1; } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6677 + return true; // L: 6678 } - if (ServerPacket.field2788 == var1.serverPacket) { - HealthBarDefinition.method2981(class240.field2774); - var1.serverPacket = null; - return true; + Widget var36; + if (ServerPacket.field2828 == var1.serverPacket) { // L: 6680 + var17 = var3.method7044(); // L: 6681 + var5 = var3.method7044(); // L: 6682 + InterfaceParent var51 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6683 + var35 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6684 + if (var35 != null) { // L: 6685 + Players.closeInterface(var35, var51 == null || var51.group != var35.group); + } + + if (var51 != null) { // L: 6686 + var51.remove(); // L: 6687 + interfaceParents.put(var51, (long)var5); // L: 6688 + } + + var36 = UserComparator9.getWidget(var17); // L: 6690 + if (var36 != null) { // L: 6691 + class184.invalidateWidget(var36); + } + + var36 = UserComparator9.getWidget(var5); // L: 6692 + if (var36 != null) { // L: 6693 + class184.invalidateWidget(var36); // L: 6694 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var36.id >>> 16], var36, true); // L: 6695 + } + + if (rootInterface != -1) { // L: 6697 + ItemComposition.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6698 + return true; // L: 6699 } - if (ServerPacket.field2871 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.method6876(); - InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var17); - var20 = (InterfaceParent)interfaceParents.get((long)var5); - if (var20 != null) { - WorldMapLabelSize.closeInterface(var20, var65 == null || var20.group != var65.group); - } - - if (var65 != null) { - var65.remove(); - interfaceParents.put(var65, (long)var5); - } - - var21 = HealthBarUpdate.getWidget(var17); - if (var21 != null) { - class16.invalidateWidget(var21); - } - - var21 = HealthBarUpdate.getWidget(var5); - if (var21 != null) { - class16.invalidateWidget(var21); - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var21.id >>> 16], var21, true); - } - - if (rootInterface != -1) { - ItemContainer.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; + if (ServerPacket.field2822 == var1.serverPacket) { // L: 6701 + publicChatMode = var3.method6996(); // L: 6702 + tradeChatMode = var3.method6997(); // L: 6703 + var1.serverPacket = null; // L: 6704 + return true; // L: 6705 } - if (ServerPacket.field2842 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { - var5 += 32768; - } - - if (var17 >= 0) { - var19 = HealthBarUpdate.getWidget(var17); - } else { - var19 = null; - } - - if (var19 != null) { - for (var7 = 0; var7 < var19.itemIds.length; ++var7) { - var19.itemIds[var7] = 0; - var19.itemQuantities[var7] = 0; - } - } - - Language.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var7; ++var8) { - var9 = var3.method6925(); - if (var9 == 255) { - var9 = var3.method6945(); - } - - var29 = var3.method7059(); - if (var19 != null && var8 < var19.itemIds.length) { - var19.itemIds[var8] = var29; - var19.itemQuantities[var8] = var9; - } - - class65.itemContainerSetItem(var5, var8, var29 - 1, var9); - } - - if (var19 != null) { - class16.invalidateWidget(var19); - } - - class120.method2530(); - changedItemContainers[++field679 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2870 == var1.serverPacket) { - MusicPatchNode2.privateChatMode = class129.method2671(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2836 == var1.serverPacket) { - isCameraLocked = true; - PcmPlayer.field284 = var3.readUnsignedByte(); - class120.field1408 = var3.readUnsignedByte(); - PacketBufferNode.field2786 = var3.readUnsignedShort(); - Login.field906 = var3.readUnsignedByte(); - class281.field3324 = var3.readUnsignedByte(); - if (class281.field3324 >= 100) { - Canvas.cameraX = PcmPlayer.field284 * 128 + 64; - VarpDefinition.cameraZ = class120.field1408 * 128 + 64; - class14.cameraY = MidiPcmStream.getTileHeight(Canvas.cameraX, VarpDefinition.cameraZ, VertexNormal.Client_plane) - PacketBufferNode.field2786; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2851 == var1.serverPacket) { - var17 = var3.method6945(); - var5 = var3.method6933(); - Varps.Varps_temp[var5] = var17; - if (Varps.Varps_main[var5] != var17) { - Varps.Varps_main[var5] = var17; - } - - NetSocket.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2807 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - Script.forceDisconnect(var17); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2821 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { + if (ServerPacket.field2887 == var1.serverPacket) { // L: 6707 + destinationX = var3.readUnsignedByte(); // L: 6708 + if (destinationX == 255) { // L: 6709 destinationX = 0; } - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { + destinationY = var3.readUnsignedByte(); // L: 6710 + if (destinationY == 255) { // L: 6711 destinationY = 0; } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6712 + return true; // L: 6713 } - Timer.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -215332077 * -971819237 : -1) + "," + (var1.field1293 != null ? var1.field1293.id * -215332077 * -971819237 : -1) + "," + (var1.field1288 != null ? var1.field1288.id * -215332077 * -971819237 : -1) + "," + var1.serverPacketLength, (Throwable)null); - AttackOption.logOut(); - } catch (IOException var44) { - class20.method302(); + if (ServerPacket.field2815 == var1.serverPacket) { // L: 6715 + ItemComposition.method3406(); // L: 6716 + var17 = var3.method6997(); // L: 6717 + var5 = var3.method7015(); // L: 6718 + var18 = var3.method6995(); // L: 6719 + experience[var17] = var5; // L: 6720 + currentLevels[var17] = var18; // L: 6721 + levels[var17] = 1; // L: 6722 + + for (var7 = 0; var7 < 98; ++var7) { // L: 6723 + if (var5 >= Skills.Skills_experienceTable[var7]) { + levels[var17] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var17; // L: 6724 + var1.serverPacket = null; // L: 6725 + return true; // L: 6726 + } + + if (ServerPacket.field2807 == var1.serverPacket) { // L: 6728 + UserComparator6.method2509(); // L: 6729 + var61 = var3.readByte(); // L: 6730 + class119 var62 = new class119(var3); // L: 6731 + ClanSettings var6; + if (var61 >= 0) { // L: 6733 + var6 = currentClanSettings[var61]; + } else { + var6 = class67.guestClanSettings; // L: 6734 + } + + var62.method2577(var6); // L: 6735 + var1.serverPacket = null; // L: 6736 + return true; // L: 6737 + } + + if (ServerPacket.field2877 == var1.serverPacket) { // L: 6739 + var17 = var3.method7021(); // L: 6740 + var5 = var3.readInt(); // L: 6741 + var18 = var3.readUnsignedShort(); // L: 6742 + if (var18 == 65535) { // L: 6743 + var18 = -1; + } + + var7 = var3.method7120(); // L: 6744 + if (var7 == 65535) { // L: 6745 + var7 = -1; + } + + for (var8 = var7; var8 <= var18; ++var8) { // L: 6746 + var37 = (long)var8 + ((long)var5 << 32); // L: 6747 + Node var78 = widgetFlags.get(var37); // L: 6748 + if (var78 != null) { // L: 6749 + var78.remove(); + } + + widgetFlags.put(new IntegerNode(var17), var37); // L: 6750 + } + + var1.serverPacket = null; // L: 6752 + return true; // L: 6753 + } + + if (ServerPacket.field2800 == var1.serverPacket) { // L: 6755 + UserComparator6.method2509(); // L: 6756 + var61 = var3.readByte(); // L: 6757 + if (var1.serverPacketLength == 1) { // L: 6758 + if (var61 >= 0) { // L: 6759 + currentClanSettings[var61] = null; + } else { + class67.guestClanSettings = null; // L: 6760 + } + + var1.serverPacket = null; // L: 6761 + return true; // L: 6762 + } + + if (var61 >= 0) { // L: 6764 + currentClanSettings[var61] = new ClanSettings(var3); // L: 6765 + } else { + class67.guestClanSettings = new ClanSettings(var3); // L: 6768 + } + + var1.serverPacket = null; // L: 6770 + return true; // L: 6771 + } + + if (ServerPacket.field2798 == var1.serverPacket) { // L: 6773 + var17 = var3.method7006(); // L: 6774 + rootInterface = var17; // L: 6775 + this.resizeRoot(false); // L: 6776 + Player.Widget_resetModelFrames(var17); // L: 6777 + class54.runWidgetOnLoadListener(rootInterface); // L: 6778 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6779 + field594[var5] = true; + } + + var1.serverPacket = null; // L: 6780 + return true; // L: 6781 + } + + Widget var59; + if (ServerPacket.field2794 == var1.serverPacket) { // L: 6783 + var17 = var3.method7021(); // L: 6784 + var59 = UserComparator9.getWidget(var17); // L: 6785 + var59.modelType = 3; // L: 6786 + var59.modelId = HealthBarDefinition.localPlayer.appearance.getChatHeadId(); // L: 6787 + class184.invalidateWidget(var59); // L: 6788 + var1.serverPacket = null; // L: 6789 + return true; // L: 6790 + } + + if (ServerPacket.field2808 == var1.serverPacket) { // L: 6792 + var17 = var3.readInt(); // L: 6793 + InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6794 + if (var60 != null) { // L: 6795 + Players.closeInterface(var60, true); + } + + if (meslayerContinueWidget != null) { // L: 6796 + class184.invalidateWidget(meslayerContinueWidget); // L: 6797 + meslayerContinueWidget = null; // L: 6798 + } + + var1.serverPacket = null; // L: 6800 + return true; // L: 6801 + } + + if (ServerPacket.field2873 == var1.serverPacket) { // L: 6803 + class21.method309(class240.field2778); // L: 6804 + var1.serverPacket = null; // L: 6805 + return true; // L: 6806 + } + + if (ServerPacket.field2857 == var1.serverPacket) { // L: 6808 + class112.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6809 + field679 = cycleCntr; // L: 6810 + var1.serverPacket = null; // L: 6811 + return true; // L: 6812 + } + + if (ServerPacket.field2832 == var1.serverPacket) { // L: 6814 + minimapState = var3.readUnsignedByte(); // L: 6815 + var1.serverPacket = null; // L: 6816 + return true; // L: 6817 + } + + if (ServerPacket.field2863 == var1.serverPacket) { // L: 6819 + var47 = var3.readStringCp1252NullTerminated(); // L: 6820 + var19 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6821 + class397.addGameMessage(6, var47, var19); // L: 6822 + var1.serverPacket = null; // L: 6823 + return true; // L: 6824 + } + + if (ServerPacket.field2855 == var1.serverPacket) { // L: 6826 + class21.method309(class240.field2774); // L: 6827 + var1.serverPacket = null; // L: 6828 + return true; // L: 6829 + } + + if (ServerPacket.field2816 == var1.serverPacket) { // L: 6831 + World var48 = new World(); // L: 6832 + var48.host = var3.readStringCp1252NullTerminated(); // L: 6833 + var48.id = var3.readUnsignedShort(); // L: 6834 + var5 = var3.readInt(); // L: 6835 + var48.properties = var5; // L: 6836 + WorldMapData_1.updateGameState(45); // L: 6837 + var2.close(); // L: 6838 + var2 = null; // L: 6839 + MidiPcmStream.changeWorld(var48); // L: 6840 + var1.serverPacket = null; // L: 6841 + return false; // L: 6842 + } + + if (ServerPacket.field2814 == var1.serverPacket) { // L: 6844 + var68 = var3.readBoolean(); // L: 6845 + if (var68) { // L: 6846 + if (ClanSettings.field1440 == null) { // L: 6847 + ClanSettings.field1440 = new class300(); + } + } else { + ClanSettings.field1440 = null; // L: 6849 + } + + var1.serverPacket = null; // L: 6850 + return true; // L: 6851 + } + + if (ServerPacket.field2823 == var1.serverPacket) { // L: 6853 + class21.method309(class240.field2775); // L: 6854 + var1.serverPacket = null; // L: 6855 + return true; // L: 6856 + } + + if (ServerPacket.field2869 == var1.serverPacket) { // L: 6858 + class21.method309(class240.field2777); // L: 6859 + var1.serverPacket = null; // L: 6860 + return true; // L: 6861 + } + + if (ServerPacket.field2825 == var1.serverPacket) { // L: 6863 + var17 = var3.method7006(); // L: 6864 + if (var17 == 65535) { // L: 6865 + var17 = -1; + } + + var5 = var3.readInt(); // L: 6866 + var18 = var3.method7015(); // L: 6867 + var73 = UserComparator9.getWidget(var5); // L: 6868 + ItemComposition var74; + if (!var73.isIf3) { // L: 6869 + if (var17 == -1) { // L: 6870 + var73.modelType = 0; // L: 6871 + var1.serverPacket = null; // L: 6872 + return true; // L: 6873 + } + + var74 = TaskHandler.ItemDefinition_get(var17); // L: 6875 + var73.modelType = 4; // L: 6876 + var73.modelId = var17; // L: 6877 + var73.modelAngleX = var74.xan2d; // L: 6878 + var73.modelAngleY = var74.yan2d; // L: 6879 + var73.modelZoom = var74.zoom2d * 100 / var18; // L: 6880 + class184.invalidateWidget(var73); // L: 6881 + } else { + var73.itemId = var17; // L: 6884 + var73.itemQuantity = var18; // L: 6885 + var74 = TaskHandler.ItemDefinition_get(var17); // L: 6886 + var73.modelAngleX = var74.xan2d; // L: 6887 + var73.modelAngleY = var74.yan2d; // L: 6888 + var73.modelAngleZ = var74.zan2d; // L: 6889 + var73.modelOffsetX = var74.offsetX2d; // L: 6890 + var73.modelOffsetY = var74.offsetY2d; // L: 6891 + var73.modelZoom = var74.zoom2d; // L: 6892 + if (var74.isStackable == 1) { // L: 6893 + var73.itemQuantityMode = 1; + } else { + var73.itemQuantityMode = 2; // L: 6894 + } + + if (var73.field3106 > 0) { // L: 6895 + var73.modelZoom = var73.modelZoom * 32 / var73.field3106; + } else if (var73.rawWidth > 0) { // L: 6896 + var73.modelZoom = var73.modelZoom * 32 / var73.rawWidth; + } + + class184.invalidateWidget(var73); // L: 6897 + } + + var1.serverPacket = null; // L: 6899 + return true; // L: 6900 + } + + if (ServerPacket.field2880 == var1.serverPacket) { // L: 6902 + var17 = var3.method7044(); // L: 6903 + var5 = var3.readUnsignedShort(); // L: 6904 + Varps.Varps_temp[var5] = var17; // L: 6905 + if (Varps.Varps_main[var5] != var17) { // L: 6906 + Varps.Varps_main[var5] = var17; // L: 6907 + } + + WorldMapLabelSize.changeGameOptions(var5); // L: 6909 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6910 + var1.serverPacket = null; // L: 6911 + return true; // L: 6912 + } + + if (ServerPacket.field2876 == var1.serverPacket) { // L: 6914 + class21.method309(class240.field2779); // L: 6915 + var1.serverPacket = null; // L: 6916 + return true; // L: 6917 + } + + if (ServerPacket.field2872 == var1.serverPacket) { // L: 6919 + var17 = var3.readInt(); // L: 6920 + if (var17 != field552) { // L: 6921 + field552 = var17; // L: 6922 + class126.method2646(); // L: 6923 + } + + var1.serverPacket = null; // L: 6925 + return true; // L: 6926 + } + + if (ServerPacket.field2837 == var1.serverPacket) { // L: 6928 + field724 = cycleCntr; // L: 6929 + var61 = var3.readByte(); // L: 6930 + if (var1.serverPacketLength == 1) { // L: 6931 + if (var61 >= 0) { // L: 6932 + currentClanChannels[var61] = null; + } else { + class115.guestClanChannel = null; // L: 6933 + } + + var1.serverPacket = null; // L: 6934 + return true; // L: 6935 + } + + if (var61 >= 0) { // L: 6937 + currentClanChannels[var61] = new ClanChannel(var3); // L: 6938 + } else { + class115.guestClanChannel = new ClanChannel(var3); // L: 6941 + } + + var1.serverPacket = null; // L: 6943 + return true; // L: 6944 + } + + long var42; + if (ServerPacket.field2829 == var1.serverPacket) { // L: 6946 + var47 = var3.readStringCp1252NullTerminated(); // L: 6947 + var26 = var3.readLong(); // L: 6948 + var28 = (long)var3.readUnsignedShort(); // L: 6949 + var37 = (long)var3.readMedium(); // L: 6950 + PlayerType var41 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6951 + var42 = var37 + (var28 << 32); // L: 6952 + boolean var34 = false; // L: 6953 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6954 + if (var42 == crossWorldMessageIds[var15]) { // L: 6955 + var34 = true; // L: 6956 + break; // L: 6957 + } + } + + if (var41.isUser && class112.friendSystem.isIgnored(new Username(var47, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6960 6961 + var34 = true; + } + + if (!var34 && field539 == 0) { // L: 6963 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var42; // L: 6964 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6965 + var25 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6966 + if (var41.modIcon != -1) { // L: 6967 + class269.addChatMessage(9, SpriteMask.method4998(var41.modIcon) + var47, var25, FontName.base37DecodeLong(var26)); + } else { + class269.addChatMessage(9, var47, var25, FontName.base37DecodeLong(var26)); // L: 6968 + } + } + + var1.serverPacket = null; // L: 6970 + return true; // L: 6971 + } + + if (ServerPacket.field2801 == var1.serverPacket) { // L: 6973 + if (NPC.field1210 == null) { // L: 6974 + NPC.field1210 = new class353(class240.HitSplatDefinition_cachedSprites); + } + + class408 var46 = class240.HitSplatDefinition_cachedSprites.method6391(var3); // L: 6975 + NPC.field1210.field4033.vmethod6736(var46.field4363, var46.field4361); // L: 6976 + field662[++field663 - 1 & 31] = var46.field4363; // L: 6977 + var1.serverPacket = null; // L: 6978 + return true; // L: 6979 + } + + if (ServerPacket.field2886 == var1.serverPacket) { // L: 6981 + var17 = var3.method7015(); // L: 6982 + var5 = var3.method7007(); // L: 6983 + var18 = var3.method7007(); // L: 6984 + var73 = UserComparator9.getWidget(var17); // L: 6985 + if (var5 != var73.rawX || var18 != var73.rawY || var73.xAlignment != 0 || var73.yAlignment != 0) { // L: 6986 + var73.rawX = var5; // L: 6987 + var73.rawY = var18; // L: 6988 + var73.xAlignment = 0; // L: 6989 + var73.yAlignment = 0; // L: 6990 + class184.invalidateWidget(var73); // L: 6991 + this.alignWidget(var73); // L: 6992 + if (var73.type == 0) { // L: 6993 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var17 >> 16], var73, false); + } + } + + var1.serverPacket = null; // L: 6995 + return true; // L: 6996 + } + + if (ServerPacket.field2851 == var1.serverPacket) { // L: 6998 + var17 = var3.offset + var1.serverPacketLength; // L: 6999 + var5 = var3.readUnsignedShort(); // L: 7000 + var18 = var3.readUnsignedShort(); // L: 7001 + if (var5 != rootInterface) { // L: 7002 + rootInterface = var5; // L: 7003 + this.resizeRoot(false); // L: 7004 + Player.Widget_resetModelFrames(rootInterface); // L: 7005 + class54.runWidgetOnLoadListener(rootInterface); // L: 7006 + + for (var7 = 0; var7 < 100; ++var7) { // L: 7007 + field594[var7] = true; + } + } + + InterfaceParent var24; + for (; var18-- > 0; var24.field1011 = true) { // L: 7009 7019 + var7 = var3.readInt(); // L: 7010 + var8 = var3.readUnsignedShort(); // L: 7011 + var9 = var3.readUnsignedByte(); // L: 7012 + var24 = (InterfaceParent)interfaceParents.get((long)var7); // L: 7013 + if (var24 != null && var8 != var24.group) { // L: 7014 + Players.closeInterface(var24, true); // L: 7015 + var24 = null; // L: 7016 + } + + if (var24 == null) { // L: 7018 + var24 = DynamicObject.method1997(var7, var8, var9); + } + } + + for (var35 = (InterfaceParent)interfaceParents.first(); var35 != null; var35 = (InterfaceParent)interfaceParents.next()) { // L: 7021 + if (var35.field1011) { // L: 7022 + var35.field1011 = false; + } else { + Players.closeInterface(var35, true); // L: 7024 + } + } + + widgetFlags = new NodeHashTable(512); // L: 7027 + + while (var3.offset < var17) { // L: 7028 + var7 = var3.readInt(); // L: 7029 + var8 = var3.readUnsignedShort(); // L: 7030 + var9 = var3.readUnsignedShort(); // L: 7031 + var10 = var3.readInt(); // L: 7032 + + for (int var39 = var8; var39 <= var9; ++var39) { // L: 7033 + var42 = (long)var39 + ((long)var7 << 32); // L: 7034 + widgetFlags.put(new IntegerNode(var10), var42); // L: 7035 + } + } + + var1.serverPacket = null; // L: 7038 + return true; // L: 7039 + } + + if (ServerPacket.field2792 == var1.serverPacket) { // L: 7041 + class16.updateNpcs(true, var3); // L: 7042 + var1.serverPacket = null; // L: 7043 + return true; // L: 7044 + } + + if (ServerPacket.field2810 == var1.serverPacket) { // L: 7046 + var17 = var3.method7120(); // L: 7047 + if (var17 == 65535) { // L: 7048 + var17 = -1; + } + + ModeWhere.playSong(var17); // L: 7049 + var1.serverPacket = null; // L: 7050 + return true; // L: 7051 + } + + if (ServerPacket.field2862 == var1.serverPacket) { // L: 7053 + var17 = var3.readMedium(); // L: 7054 + var5 = var3.readUnsignedShort(); // L: 7055 + if (var5 == 65535) { // L: 7056 + var5 = -1; + } + + Friend.method6057(var5, var17); // L: 7057 + var1.serverPacket = null; // L: 7058 + return true; // L: 7059 + } + + if (ServerPacket.field2881 == var1.serverPacket) { // L: 7061 + if (var1.serverPacketLength == 0) { // L: 7062 + AbstractArchive.friendsChat = null; // L: 7063 + } else { + if (AbstractArchive.friendsChat == null) { // L: 7066 + AbstractArchive.friendsChat = new FriendsChat(GrandExchangeOfferUnitPriceComparator.loginType, ArchiveLoader.client); // L: 7067 + } + + AbstractArchive.friendsChat.readUpdate(var3); // L: 7069 + } + + ReflectionCheck.method1114(); // L: 7071 + var1.serverPacket = null; // L: 7072 + return true; // L: 7073 + } + + if (ServerPacket.field2867 == var1.serverPacket) { // L: 7075 + var17 = var3.readUnsignedByte(); // L: 7076 + ArchiveLoader.method2056(var17); // L: 7077 + var1.serverPacket = null; // L: 7078 + return true; // L: 7079 + } + + if (ServerPacket.field2819 == var1.serverPacket) { // L: 7081 + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 7082 + if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 7083 + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 7084 + WorldMapLabelSize.changeGameOptions(var17); // L: 7085 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 7086 + } + } + + var1.serverPacket = null; // L: 7089 + return true; // L: 7090 + } + + if (ServerPacket.field2817 == var1.serverPacket) { // L: 7092 + class112.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7093 + TextureProvider.FriendSystem_invalidateIgnoreds(); // L: 7094 + field679 = cycleCntr; // L: 7095 + var1.serverPacket = null; // L: 7096 + return true; // L: 7097 + } + + if (ServerPacket.field2882 == var1.serverPacket) { // L: 7099 + NPC.field1210 = null; // L: 7100 + var1.serverPacket = null; // L: 7101 + return true; // L: 7102 + } + + if (ServerPacket.field2835 == var1.serverPacket) { // L: 7104 + var17 = var3.method7015(); // L: 7105 + var59 = UserComparator9.getWidget(var17); // L: 7106 + + for (var18 = 0; var18 < var59.itemIds.length; ++var18) { // L: 7107 + var59.itemIds[var18] = -1; // L: 7108 + var59.itemIds[var18] = 0; // L: 7109 + } + + class184.invalidateWidget(var59); // L: 7111 + var1.serverPacket = null; // L: 7112 + return true; // L: 7113 + } + + if (ServerPacket.field2840 == var1.serverPacket) { // L: 7115 + ItemComposition.field1931 = var3.readUnsignedByte(); // L: 7116 + Actor.field1146 = var3.method6996(); // L: 7117 + var1.serverPacket = null; // L: 7118 + return true; // L: 7119 + } + + if (ServerPacket.field2830 == var1.serverPacket) { // L: 7121 + GameBuild.updatePlayers(var3, var1.serverPacketLength); // L: 7122 + class279.method5216(); // L: 7123 + var1.serverPacket = null; // L: 7124 + return true; // L: 7125 + } + + if (ServerPacket.field2879 == var1.serverPacket) { // L: 7127 + NPC.field1210 = new class353(class240.HitSplatDefinition_cachedSprites); // L: 7128 + var1.serverPacket = null; // L: 7129 + return true; // L: 7130 + } + + if (ServerPacket.field2795 == var1.serverPacket) { // L: 7132 + var17 = var3.readUnsignedShort(); // L: 7133 + var5 = var3.readUnsignedShort(); // L: 7134 + var18 = var3.readUnsignedShort(); // L: 7135 + var7 = var3.method7015(); // L: 7136 + var36 = UserComparator9.getWidget(var7); // L: 7137 + if (var17 != var36.modelAngleX || var5 != var36.modelAngleY || var18 != var36.modelZoom) { // L: 7138 + var36.modelAngleX = var17; // L: 7139 + var36.modelAngleY = var5; // L: 7140 + var36.modelZoom = var18; // L: 7141 + class184.invalidateWidget(var36); // L: 7142 + } + + var1.serverPacket = null; // L: 7144 + return true; // L: 7145 + } + + if (ServerPacket.field2831 == var1.serverPacket) { // L: 7147 + hintArrowType = var3.readUnsignedByte(); // L: 7148 + if (hintArrowType == 1) { // L: 7149 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7150 + if (hintArrowType == 2) { // L: 7151 + hintArrowSubX = 64; // L: 7152 + hintArrowSubY = 64; // L: 7153 + } + + if (hintArrowType == 3) { // L: 7155 + hintArrowSubX = 0; // L: 7156 + hintArrowSubY = 64; // L: 7157 + } + + if (hintArrowType == 4) { // L: 7159 + hintArrowSubX = 128; // L: 7160 + hintArrowSubY = 64; // L: 7161 + } + + if (hintArrowType == 5) { // L: 7163 + hintArrowSubX = 64; // L: 7164 + hintArrowSubY = 0; // L: 7165 + } + + if (hintArrowType == 6) { // L: 7167 + hintArrowSubX = 64; // L: 7168 + hintArrowSubY = 128; // L: 7169 + } + + hintArrowType = 2; // L: 7171 + hintArrowX = var3.readUnsignedShort(); // L: 7172 + hintArrowY = var3.readUnsignedShort(); // L: 7173 + hintArrowHeight = var3.readUnsignedByte(); // L: 7174 + } + + if (hintArrowType == 10) { // L: 7176 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 7177 + return true; // L: 7178 + } + + if (ServerPacket.field2799 == var1.serverPacket) { // L: 7180 + if (AbstractArchive.friendsChat != null) { // L: 7181 + AbstractArchive.friendsChat.method6040(var3); // L: 7182 + } + + ReflectionCheck.method1114(); // L: 7184 + var1.serverPacket = null; // L: 7185 + return true; // L: 7186 + } + + MilliClock.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1996281945 * -662376471 : -1) + "," + (var1.field1284 != null ? var1.field1284.id * 1996281945 * -662376471 : -1) + "," + (var1.field1285 != null ? var1.field1285.id * 1996281945 * -662376471 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7188 + SequenceDefinition.logOut(); // L: 7189 + } catch (IOException var44) { // L: 7191 + Clock.method2960(); // L: 7192 } catch (Exception var45) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -215332077 * -971819237 : -1) + "," + (var1.field1293 != null ? var1.field1293.id * -215332077 * -971819237 : -1) + "," + (var1.field1288 != null ? var1.field1288.id * -215332077 * -971819237 : -1) + "," + var1.serverPacketLength + "," + (class67.localPlayer.pathX[0] + WorldMapSectionType.baseX) + "," + (class67.localPlayer.pathY[0] + PlayerComposition.baseY) + ","; + var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1996281945 * -662376471 : -1) + "," + (var1.field1284 != null ? var1.field1284.id * 1996281945 * -662376471 : -1) + "," + (var1.field1285 != null ? var1.field1285.id * 1996281945 * -662376471 : -1) + "," + var1.serverPacketLength + "," + (HealthBarDefinition.localPlayer.pathX[0] + class19.baseX) + "," + (HealthBarDefinition.localPlayer.pathY[0] + DefaultsGroup.baseY) + ","; // L: 7195 - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var18 = var18 + var3.array[var6] + ","; + for (var18 = 0; var18 < var1.serverPacketLength && var18 < 50; ++var18) { // L: 7196 + var19 = var19 + var3.array[var18] + ","; } - Timer.RunException_sendStackTrace(var18, var45); - AttackOption.logOut(); + MilliClock.RunException_sendStackTrace(var19, var45); // L: 7197 + SequenceDefinition.logOut(); // L: 7198 } - return true; + return true; // L: 7200 } } - @ObfuscatedName("ho") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" + descriptor = "(I)V", + garbageValue = "46102630" ) @Export("menu") final void menu() { - boolean var1 = false; + class29.method414(); // L: 8115 + if (class247.dragInventoryWidget == null) { // L: 8116 + if (clickedWidget == null) { // L: 8117 + int var1 = MouseHandler.MouseHandler_lastButton; // L: 8118 + int var2; + int var4; + int var5; + int var6; + int var8; + int var9; + if (isMenuOpen) { // L: 8119 + int var3; + int var13; + if (var1 != 1 && (ApproximateRouteStrategy.mouseCam || var1 != 4)) { // L: 8120 + var2 = MouseHandler.MouseHandler_x; // L: 8121 + var3 = MouseHandler.MouseHandler_y; // L: 8122 + if (var2 < SecureRandomCallable.menuX - 10 || var2 > SecureRandomCallable.menuX + ObjectComposition.menuWidth + 10 || var3 < Frames.menuY - 10 || var3 > StudioGame.menuHeight + Frames.menuY + 10) { // L: 8123 + isMenuOpen = false; // L: 8124 + var4 = SecureRandomCallable.menuX; // L: 8125 + var5 = Frames.menuY; // L: 8126 + var6 = ObjectComposition.menuWidth; // L: 8127 + var13 = StudioGame.menuHeight; // L: 8128 - int var2; - int var5; - while (!var1) { - var1 = true; - - for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { - if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { - String var18 = menuTargets[var2]; - menuTargets[var2] = menuTargets[var2 + 1]; - menuTargets[var2 + 1] = var18; - String var19 = menuActions[var2]; - menuActions[var2] = menuActions[var2 + 1]; - menuActions[var2 + 1] = var19; - var5 = menuOpcodes[var2]; - menuOpcodes[var2] = menuOpcodes[var2 + 1]; - menuOpcodes[var2 + 1] = var5; - var5 = menuArguments1[var2]; - menuArguments1[var2] = menuArguments1[var2 + 1]; - menuArguments1[var2 + 1] = var5; - var5 = menuArguments2[var2]; - menuArguments2[var2] = menuArguments2[var2 + 1]; - menuArguments2[var2 + 1] = var5; - var5 = menuIdentifiers[var2]; - menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; - menuIdentifiers[var2 + 1] = var5; - boolean var6 = menuShiftClick[var2]; - menuShiftClick[var2] = menuShiftClick[var2 + 1]; - menuShiftClick[var2 + 1] = var6; - var1 = false; - } - } - } - - if (GameEngine.dragInventoryWidget == null) { - if (clickedWidget == null) { - int var21; - label302: { - int var20 = MouseHandler.MouseHandler_lastButton; - int var4; - int var9; - int var14; - if (isMenuOpen) { - int var3; - int var22; - if (var20 != 1 && (VarbitComposition.mouseCam || var20 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < LoginScreenAnimation.menuX - 10 || var2 > LoginScreenAnimation.menuX + UserComparator7.menuWidth + 10 || var3 < class392.menuY - 10 || var3 > class392.menuY + ApproximateRouteStrategy.menuHeight + 10) { - isMenuOpen = false; - var4 = LoginScreenAnimation.menuX; - var5 = class392.menuY; - var21 = UserComparator7.menuWidth; - var14 = ApproximateRouteStrategy.menuHeight; - - for (var22 = 0; var22 < rootWidgetCount; ++var22) { - if (rootWidgetWidths[var22] + rootWidgetXs[var22] > var4 && rootWidgetXs[var22] < var21 + var4 && rootWidgetYs[var22] + rootWidgetHeights[var22] > var5 && rootWidgetYs[var22] < var5 + var14) { - field710[var22] = true; - } + for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 8130 + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var6 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var13) { // L: 8131 + field594[var8] = true; } } } - - if (var20 == 1 || !VarbitComposition.mouseCam && var20 == 4) { - var2 = LoginScreenAnimation.menuX; - var3 = class392.menuY; - var4 = UserComparator7.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - var21 = MouseHandler.MouseHandler_lastPressedY; - var14 = -1; - - for (var22 = 0; var22 < menuOptionsCount; ++var22) { - var9 = var3 + (menuOptionsCount - 1 - var22) * 15 + 31; - if (var5 > var2 && var5 < var4 + var2 && var21 > var9 - 13 && var21 < var9 + 3) { - var14 = var22; - } - } - - int var10; - int var11; - if (var14 != -1 && var14 >= 0) { - var22 = menuArguments1[var14]; - var9 = menuArguments2[var14]; - var10 = menuOpcodes[var14]; - var11 = menuIdentifiers[var14]; - String var12 = menuActions[var14]; - String var13 = menuTargets[var14]; - PlatformInfo.menuAction(var22, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - isMenuOpen = false; - var22 = LoginScreenAnimation.menuX; - var9 = class392.menuY; - var10 = UserComparator7.menuWidth; - var11 = ApproximateRouteStrategy.menuHeight; - - for (int var17 = 0; var17 < rootWidgetCount; ++var17) { - if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var22 && rootWidgetXs[var17] < var22 + var10 && rootWidgetYs[var17] + rootWidgetHeights[var17] > var9 && rootWidgetYs[var17] < var11 + var9) { - field710[var17] = true; - } - } - } - } else { - var2 = menuOptionsCount - 1; - if ((var20 == 1 || !VarbitComposition.mouseCam && var20 == 4) && var2 >= 0) { - var4 = menuOpcodes[var2]; - if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { - var5 = menuArguments1[var2]; - var21 = menuArguments2[var2]; - Widget var7 = HealthBarUpdate.getWidget(var21); - var9 = WorldMapRegion.getWidgetFlags(var7); - boolean var8 = (var9 >> 28 & 1) != 0; - if (var8) { - break label302; - } - - Object var10000 = null; - if (class114.method2493(WorldMapRegion.getWidgetFlags(var7))) { - break label302; - } - } - } - - if ((var20 == 1 || !VarbitComposition.mouseCam && var20 == 4) && this.shouldLeftClickOpenMenu()) { - var20 = 2; - } - - if ((var20 == 1 || !VarbitComposition.mouseCam && var20 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var4 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - var21 = menuOpcodes[var2]; - var14 = menuIdentifiers[var2]; - String var15 = menuActions[var2]; - String var16 = menuTargets[var2]; - PlatformInfo.menuAction(var4, var5, var21, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - if (var20 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } } - return; + if (var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) { // L: 8136 + var2 = SecureRandomCallable.menuX; // L: 8137 + var3 = Frames.menuY; // L: 8138 + var4 = ObjectComposition.menuWidth; // L: 8139 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8140 + var6 = MouseHandler.MouseHandler_lastPressedY; // L: 8141 + var13 = -1; // L: 8142 + + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8143 + var9 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; // L: 8144 + if (var5 > var2 && var5 < var2 + var4 && var6 > var9 - 13 && var6 < var9 + 3) { // L: 8145 + var13 = var8; + } + } + + if (var13 != -1) { // L: 8147 + class67.method1913(var13); + } + + isMenuOpen = false; // L: 8148 + var8 = SecureRandomCallable.menuX; // L: 8149 + var9 = Frames.menuY; // L: 8150 + int var14 = ObjectComposition.menuWidth; // L: 8151 + int var11 = StudioGame.menuHeight; // L: 8152 + + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 8154 + if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var14 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { // L: 8155 + field594[var12] = true; + } + } + } + } else { + var2 = menuOptionsCount - 1; // L: 8163 + if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && var2 >= 0) { // L: 8166 + var4 = menuOpcodes[var2]; // L: 8167 + if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 8168 + var5 = menuArguments1[var2]; // L: 8169 + var6 = menuArguments2[var2]; // L: 8170 + Widget var7 = UserComparator9.getWidget(var6); // L: 8171 + if (HorizontalAlignment.method3114(PendingSpawn.getWidgetFlags(var7)) || TileItem.method2316(PendingSpawn.getWidgetFlags(var7))) { // L: 8172 + if (class247.dragInventoryWidget != null && !field667 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8173 8174 + var8 = draggedWidgetX; // L: 8175 + var9 = draggedWidgetY; // L: 8176 + MenuAction var10 = class274.tempMenuAction; // L: 8178 + class14.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var8, var9); // L: 8180 + class274.tempMenuAction = null; // L: 8182 + } + + field667 = false; // L: 8186 + itemDragDuration = 0; // L: 8187 + if (class247.dragInventoryWidget != null) { // L: 8188 + class184.invalidateWidget(class247.dragInventoryWidget); + } + + class247.dragInventoryWidget = UserComparator9.getWidget(var6); // L: 8189 + dragItemSlotSource = var5; // L: 8190 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8191 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8192 + if (var2 >= 0) { // L: 8193 + class12.method170(var2); + } + + class184.invalidateWidget(class247.dragInventoryWidget); // L: 8194 + return; // L: 8195 + } + } + } + + if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8199 8200 + var1 = 2; // L: 8201 + } + + if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 8204 + class67.method1913(var2); // L: 8205 + } + + if (var1 == 2 && menuOptionsCount > 0) { // L: 8207 + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if (GameEngine.dragInventoryWidget != null && !field602 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - Renderable.method4395(draggedWidgetX, draggedWidgetY); - } - - field602 = false; - itemDragDuration = 0; - if (GameEngine.dragInventoryWidget != null) { - class16.invalidateWidget(GameEngine.dragInventoryWidget); - } - - GameEngine.dragInventoryWidget = HealthBarUpdate.getWidget(var21); - dragItemSlotSource = var5; - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - NetFileRequest.method5216(var2); - } - - class16.invalidateWidget(GameEngine.dragInventoryWidget); } } - } + } // L: 8209 - @ObfuscatedName("hn") + @ObfuscatedName("hz") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1799994804" + garbageValue = "-296322242" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = menuOptionsCount - 1; - boolean var3 = leftClickOpensMenu == 1 && menuOptionsCount > 2; - if (!var3) { - boolean var4; - if (var1 < 0) { - var4 = false; - } else { - int var5 = menuOpcodes[var1]; - if (var5 >= 2000) { - var5 -= 2000; - } - - if (var5 == 1007) { - var4 = true; - } else { - var4 = false; - } - } - - var3 = var4; - } - - return var3 && !menuShiftClick[var1]; + int var1 = menuOptionsCount - 1; // L: 8214 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequest.method2446(var1)) && !menuShiftClick[var1]; // L: 8217 } - @ObfuscatedName("hu") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1352837868" + descriptor = "(IIB)V", + garbageValue = "8" ) @Export("openMenu") final void openMenu(int var1, int var2) { - Widget.method4997(var1, var2); - PlayerComposition.scene.menuOpen(VertexNormal.Client_plane, var1, var2, false); - isMenuOpen = true; - } + class392.method6871(var1, var2); // L: 8221 + GameBuild.scene.menuOpen(GrandExchangeOfferTotalQuantityComparator.Client_plane, var1, var2, false); // L: 8222 + isMenuOpen = true; // L: 8223 + } // L: 8224 - @ObfuscatedName("iu") + @ObfuscatedName("iw") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-406971088" + garbageValue = "-586334153" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - Canvas.method380(rootInterface, Huffman.canvasWidth, MouseRecorder.canvasHeight, var1); - } + SecureRandomCallable.method2051(rootInterface, GameEngine.canvasWidth, KeyHandler.canvasHeight, var1); // L: 10209 + } // L: 10210 - @ObfuscatedName("ir") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(Ljt;I)V", - garbageValue = "2032857847" + descriptor = "(Ljf;I)V", + garbageValue = "925917033" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : HealthBarUpdate.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : UserComparator9.getWidget(var1.parentId); // L: 10213 int var3; int var4; - if (var2 == null) { - var3 = Huffman.canvasWidth; - var4 = MouseRecorder.canvasHeight; + if (var2 == null) { // L: 10216 + var3 = GameEngine.canvasWidth; // L: 10217 + var4 = KeyHandler.canvasHeight; // L: 10218 } else { - var3 = var2.width; - var4 = var2.height; + var3 = var2.width; // L: 10221 + var4 = var2.height; // L: 10222 } - WorldMapEvent.alignWidgetSize(var1, var3, var4, false); - HorizontalAlignment.alignWidgetPosition(var1, var3, var4); - } + WorldMapScaleHandler.alignWidgetSize(var1, var3, var4, false); // L: 10224 + LoginPacket.alignWidgetPosition(var1, var3, var4); // L: 10225 + } // L: 10226 - @ObfuscatedName("jk") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1536" + descriptor = "(I)V", + garbageValue = "407876174" ) - final void method1349() { - class16.invalidateWidget(clickedWidget); - ++MouseHandler.widgetDragDuration; - if (field671 && field595) { - int var1 = MouseHandler.MouseHandler_x; - int var2 = MouseHandler.MouseHandler_y; - var1 -= widgetClickX; - var2 -= widgetClickY; - if (var1 < field669) { - var1 = field669; + final void method1186() { + class184.invalidateWidget(clickedWidget); // L: 11190 + ++class134.widgetDragDuration; // L: 11191 + if (field680 && field648) { // L: 11192 + int var1 = MouseHandler.MouseHandler_x; // L: 11198 + int var2 = MouseHandler.MouseHandler_y; // L: 11199 + var1 -= widgetClickX; // L: 11200 + var2 -= widgetClickY; // L: 11201 + if (var1 < field649) { // L: 11202 + var1 = field649; } - if (var1 + clickedWidget.width > field669 + clickedWidgetParent.width) { - var1 = field669 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field649 + clickedWidgetParent.width) { // L: 11203 + var1 = field649 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field670) { - var2 = field670; + if (var2 < field650) { // L: 11204 + var2 = field650; } - if (var2 + clickedWidget.height > field670 + clickedWidgetParent.height) { - var2 = field670 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field650 + clickedWidgetParent.height) { // L: 11205 + var2 = field650 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field672; - int var4 = var2 - field608; - int var5 = clickedWidget.dragZoneSize; - if (MouseHandler.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { - isDraggingWidget = true; + int var3 = var1 - field652; // L: 11206 + int var4 = var2 - field468; // L: 11207 + int var5 = clickedWidget.dragZoneSize; // L: 11208 + if (class134.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11209 11210 + isDraggingWidget = true; // L: 11211 } - int var6 = var1 - field669 + clickedWidgetParent.scrollX; - int var7 = var2 - field670 + clickedWidgetParent.scrollY; + int var6 = var1 - field649 + clickedWidgetParent.scrollX; // L: 11214 + int var7 = var2 - field650 + clickedWidgetParent.scrollY; // L: 11215 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { - var8 = new ScriptEvent(); - var8.widget = clickedWidget; - var8.mouseX = var6; - var8.mouseY = var7; - var8.args = clickedWidget.onDrag; - ViewportMouse.runScriptEvent(var8); + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11216 + var8 = new ScriptEvent(); // L: 11217 + var8.widget = clickedWidget; // L: 11218 + var8.mouseX = var6; // L: 11219 + var8.mouseY = var7; // L: 11220 + var8.args = clickedWidget.onDrag; // L: 11221 + Tile.runScriptEvent(var8); // L: 11222 } - 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; - ViewportMouse.runScriptEvent(var8); + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11224 + if (isDraggingWidget) { // L: 11225 + if (clickedWidget.onDragComplete != null) { // L: 11226 + var8 = new ScriptEvent(); // L: 11227 + var8.widget = clickedWidget; // L: 11228 + var8.mouseX = var6; // L: 11229 + var8.mouseY = var7; // L: 11230 + var8.dragTarget = draggedOnWidget; // L: 11231 + var8.args = clickedWidget.onDragComplete; // L: 11232 + Tile.runScriptEvent(var8); // L: 11233 } - if (draggedOnWidget != null) { - Widget var9 = clickedWidget; - int var10 = Friend.method6003(WorldMapRegion.getWidgetFlags(var9)); - Widget var13; - if (var10 == 0) { - var13 = null; - } else { - int var11 = 0; - - while (true) { - if (var11 >= var10) { - var13 = var9; - break; - } - - var9 = HealthBarUpdate.getWidget(var9.parentId); - if (var9 == null) { - var13 = null; - break; - } - - ++var11; - } - } - - if (var13 != null) { - PacketBufferNode var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2684, packetWriter.isaacCipher); - var12.packetBuffer.method6942(clickedWidget.id); - var12.packetBuffer.method7029(clickedWidget.childIndex); - var12.packetBuffer.method6930(draggedOnWidget.childIndex); - var12.packetBuffer.writeShort(draggedOnWidget.itemId); - var12.packetBuffer.method6931(clickedWidget.itemId); - var12.packetBuffer.method6940(draggedOnWidget.id); - packetWriter.addNode(var12); - } + if (draggedOnWidget != null && BuddyRankComparator.method2501(clickedWidget) != null) { // L: 11235 + PacketBufferNode var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2727, packetWriter.isaacCipher); // L: 11237 + var12.packetBuffer.method7001(draggedOnWidget.itemId); // L: 11238 + var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11239 + var12.packetBuffer.method7001(clickedWidget.childIndex); // L: 11240 + var12.packetBuffer.method7126(draggedOnWidget.id); // L: 11241 + var12.packetBuffer.method7001(clickedWidget.itemId); // L: 11242 + var12.packetBuffer.writeIntME(clickedWidget.id); // L: 11243 + packetWriter.addNode(var12); // L: 11244 } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field672 + widgetClickX, widgetClickY + field608); - } else if (menuOptionsCount > 0) { - Renderable.method4395(widgetClickX + field672, field608 + widgetClickY); + } else if (this.shouldLeftClickOpenMenu()) { // L: 11248 + this.openMenu(field652 + widgetClickX, widgetClickY + field468); // L: 11249 + } else if (menuOptionsCount > 0) { // L: 11251 + int var11 = widgetClickX + field652; // L: 11252 + int var9 = widgetClickY + field468; // L: 11253 + MenuAction var10 = class274.tempMenuAction; // L: 11255 + class14.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); // L: 11257 + class274.tempMenuAction = null; // L: 11259 } - clickedWidget = null; + clickedWidget = null; // L: 11263 } } else { - if (MouseHandler.widgetDragDuration > 1) { - clickedWidget = null; + if (class134.widgetDragDuration > 1) { // L: 11193 + clickedWidget = null; // L: 11194 } } - } + } // L: 11196 11265 - @ObfuscatedName("kz") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(B)Lpm;", - garbageValue = "-28" + descriptor = "(I)Lpb;", + garbageValue = "-1245448697" ) @Export("username") public Username username() { - return class67.localPlayer != null ? class67.localPlayer.username : null; + return HealthBarDefinition.localPlayer != null ? HealthBarDefinition.localPlayer.username : null; // L: 11998 } public final void init() { try { - if (this.checkHost()) { - for (int var1 = 0; var1 <= 27; ++var1) { - String var2 = this.getParameter(Integer.toString(var1)); - if (var2 != null) { - switch(var1) { + if (this.checkHost()) { // L: 658 + for (int var1 = 0; var1 <= 27; ++var1) { // L: 659 + String var2 = this.getParameter(Integer.toString(var1)); // L: 660 + if (var2 != null) { // L: 661 + switch(var1) { // L: 662 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 746 case 2: case 13: case 16: @@ -5977,155 +6805,128 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 717 isMembersWorld = true; } else { - isMembersWorld = false; + isMembersWorld = false; // L: 718 } break; case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var2); + if (clientType == -1) { // L: 734 + clientType = Integer.parseInt(var2); // L: 735 } break; case 5: - worldProperties = Integer.parseInt(var2); - break; + worldProperties = Integer.parseInt(var2); // L: 712 + break; // L: 713 case 6: - int var4 = Integer.parseInt(var2); - Language var9; - if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { - var9 = Language.Language_valuesOrdered[var4]; - } else { - var9 = null; - } - - ReflectionCheck.clientLanguage = var9; - break; + MouseHandler.clientLanguage = Language.method5519(Integer.parseInt(var2)); // L: 729 + break; // L: 730 case 7: - class29.field171 = class114.method2494(Integer.parseInt(var2)); - break; + ArchiveLoader.field984 = WorldMapIcon_0.method3890(Integer.parseInt(var2)); // L: 707 + break; // L: 708 case 8: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 723 } break; case 9: - ItemContainer.field1009 = var2; - break; + UserComparator3.field1316 = var2; // L: 682 + break; // L: 683 case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.oldscape, StudioGame.runescape, StudioGame.game3, StudioGame.game4, StudioGame.stellardawn, StudioGame.game5}; - class392.field4267 = (StudioGame)class128.findEnumerated(var3, Integer.parseInt(var2)); - if (class392.field4267 == StudioGame.oldscape) { - WorldMapSectionType.loginType = LoginType.oldscape; + RouteStrategy.field1986 = (StudioGame)UserComparator4.findEnumerated(class157.method3084(), Integer.parseInt(var2)); // L: 665 + if (StudioGame.oldscape == RouteStrategy.field1986) { // L: 666 + GrandExchangeOfferUnitPriceComparator.loginType = LoginType.oldscape; } else { - WorldMapSectionType.loginType = LoginType.field4227; + GrandExchangeOfferUnitPriceComparator.loginType = LoginType.field4231; // L: 667 } break; case 11: - Varcs.field1264 = var2; - break; + WorldMapSection1.field2203 = var2; // L: 672 + break; // L: 673 case 12: - worldId = Integer.parseInt(var2); - break; + worldId = Integer.parseInt(var2); // L: 692 + break; // L: 693 case 14: - KeyHandler.field142 = Integer.parseInt(var2); - break; + TextureProvider.field2483 = Integer.parseInt(var2); // L: 687 + break; // L: 688 case 15: - gameBuild = Integer.parseInt(var2); - break; + gameBuild = Integer.parseInt(var2); // L: 697 + break; // L: 698 case 17: - Messages.field1273 = var2; - break; + BoundaryObject.field2618 = var2; // L: 702 + break; // L: 703 case 21: - field524 = Integer.parseInt(var2); - break; + field467 = Integer.parseInt(var2); // L: 677 + break; // L: 678 case 22: - field540 = Integer.parseInt(var2) != 0; + field619 = Integer.parseInt(var2) != 0; // L: 741 } } } - class391.method6795(); - EnumComposition.worldHost = this.getCodeBase().getHost(); - String var5 = class29.field171.name; - byte var6 = 0; + Scene.Scene_isLowDetail = false; // L: 753 + isLowDetail = false; // L: 754 + WorldMapIcon_0.worldHost = this.getCodeBase().getHost(); // L: 756 + String var4 = ArchiveLoader.field984.name; // L: 757 + byte var5 = 0; // L: 758 try { - class114.method2485("oldschool", var5, var6, 21); - } catch (Exception var7) { - Timer.RunException_sendStackTrace((String)null, var7); + class300.method5507("oldschool", var4, var5, 21); // L: 760 + } catch (Exception var6) { // L: 762 + MilliClock.RunException_sendStackTrace((String)null, var6); // L: 763 } - class21.client = this; - RunException.clientType = clientType; - if (field681 == -1) { - field681 = 0; + ArchiveLoader.client = this; // L: 765 + RunException.clientType = clientType; // L: 766 + if (field469 == -1) { // L: 767 + field469 = 0; // L: 768 } - WorldMapSectionType.field2140 = System.getenv("JX_ACCESS_TOKEN"); - System.getenv("JX_REFRESH_TOKEN"); - this.startThread(765, 503, 200); + JagexCache.field1560 = System.getenv("JX_ACCESS_TOKEN"); // L: 770 + System.getenv("JX_REFRESH_TOKEN"); // L: 771 + this.startThread(765, 503, 201); // L: 772 } - } catch (RuntimeException var8) { - throw class91.newRunException(var8, "client.init(" + ')'); + } catch (RuntimeException var7) { + throw MouseHandler.newRunException(var7, "client.init(" + ')'); } - } + } // L: 773 public void setOAuthTokens(String var1, String var2) { - if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { - WorldMapSectionType.field2140 = var1; - class112.method2474(10); + if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { // L: 776 + JagexCache.field1560 = var1; // L: 779 + class275.method5201(10); // L: 780 } + } // L: 777 781 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "-6598" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 130 } - @ObfuscatedName("q") + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1649359847" + descriptor = "(I)Z", + garbageValue = "1972300304" ) - static int method1588(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; + static boolean method1643() { + if (archiveLoaders != null && archiveLoadersDone < archiveLoaders.size()) { // L: 1983 + while (archiveLoadersDone < archiveLoaders.size()) { // L: 1984 + ArchiveLoader var0 = (ArchiveLoader)archiveLoaders.get(archiveLoadersDone); // L: 1985 + if (!var0.isLoaded()) { // L: 1986 + return false; + } + + ++archiveLoadersDone; // L: 1987 } - var1 = 127 - var1; - return var1; + return true; // L: 1989 } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + return true; // L: 1988 } } - - @ObfuscatedName("ft") - @ObfuscatedSignature( - descriptor = "(Lcd;I)V", - garbageValue = "-1157644084" - ) - static final void method1589(Actor var0) { - if (var0.field1165 == cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > KitDefinition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field1165 - var0.field1145; - int var2 = cycle - var0.field1145; - int var3 = var0.field1109 * 64 + var0.field1148 * 128; - int var4 = var0.field1109 * 64 + var0.field1126 * 128; - int var5 = var0.field1109 * 64 + var0.field1149 * 128; - int var6 = var0.field1109 * 64 + var0.field1125 * 128; - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; - } - - var0.field1164 = 0; - var0.orientation = var0.field1151; - var0.rotation = var0.orientation; - } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 4fe918ddcc..b1c3107b19 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,663 +4,769 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("ik") @Implements("ClientPacket") public class ClientPacket implements class238 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2706; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2660; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2737; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2662; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2663; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2664; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2665; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2689; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2667; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2668; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2690; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2672; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2711; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2699; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2673; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2670; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2727; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2676; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2677; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2694; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2766; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2680; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2681; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2682; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2688; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2684; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2758; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2686; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2687; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2692; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2675; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2696; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2685; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2707; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - static final ClientPacket field2748; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2691; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2693; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2679; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2697; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2759; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2713; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2700; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2701; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - static final ClientPacket field2702; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2703; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2704; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2671; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2750; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2742; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2708; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2709; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2710; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2683; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2712; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2719; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2714; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2705; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2716; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2717; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2718; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2666; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2720; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2695; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2722; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2723; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2724; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2725; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2669; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2721; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2728; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2729; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2730; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2731; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2732; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2733; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) public static final ClientPacket field2734; - @ObfuscatedName("bp") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2735; - @ObfuscatedName("br") + public static final ClientPacket field2684; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2736; - @ObfuscatedName("ca") + public static final ClientPacket field2757; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2678; - @ObfuscatedName("ct") + public static final ClientPacket field2667; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - static final ClientPacket field2661; - @ObfuscatedName("cy") + public static final ClientPacket field2668; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2739; - @ObfuscatedName("cg") + public static final ClientPacket field2669; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2740; - @ObfuscatedName("ci") + public static final ClientPacket field2693; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2741; - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2698; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2743; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - static final ClientPacket field2674; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2745; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2746; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2747; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2726; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - public static final ClientPacket field2749; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) public static final ClientPacket field2755; - @ObfuscatedName("cz") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2751; - @ObfuscatedName("cu") + public static final ClientPacket field2672; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2752; - @ObfuscatedName("cv") + public static final ClientPacket field2673; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2753; - @ObfuscatedName("cn") + public static final ClientPacket field2745; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2754; - @ObfuscatedName("cf") + public static final ClientPacket field2675; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2738; - @ObfuscatedName("ch") + public static final ClientPacket field2676; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2756; - @ObfuscatedName("cc") + public static final ClientPacket field2677; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - static final ClientPacket field2757; - @ObfuscatedName("cj") + public static final ClientPacket field2713; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2659; - @ObfuscatedName("co") + public static final ClientPacket field2748; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" + ) + public static final ClientPacket field2680; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2681; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2682; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2683; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2699; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2685; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2686; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2687; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2688; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2689; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lik;" ) public static final ClientPacket field2715; - @ObfuscatedName("ck") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2760; - @ObfuscatedName("cb") + public static final ClientPacket field2754; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2761; - @ObfuscatedName("cm") + public static final ClientPacket field2750; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) - public static final ClientPacket field2762; - @ObfuscatedName("db") + public static final ClientPacket field2758; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" + ) + public static final ClientPacket field2692; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2733; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2696; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2697; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + static final ClientPacket field2698; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2666; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2700; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2722; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2739; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2665; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2704; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2705; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2694; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2702; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + static final ClientPacket field2708; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2709; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2710; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2711; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2712; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2714; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2679; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lik;" ) public static final ClientPacket field2763; - @ObfuscatedName("dx") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" + ) + public static final ClientPacket field2716; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2717; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2718; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2719; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2720; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2721; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2695; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2723; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2724; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2725; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2726; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2727; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2761; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2729; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2730; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2731; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + static final ClientPacket field2732; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2691; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2707; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2735; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2736; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2737; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2738; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + static final ClientPacket field2674; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2671; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2741; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2742; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2743; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2744; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2728; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2670; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2747; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2690; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2749; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2767; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2746; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2752; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2753; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2664; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2751; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2756; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2706; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2740; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2759; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2703; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2701; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + static final ClientPacket field2762; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2769; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lik;" ) public static final ClientPacket field2764; - @ObfuscatedName("dd") + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2765; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2766; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2678; + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2768; + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + public static final ClientPacket field2760; + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 1537742509 + intValue = 1306190951 ) @Export("id") final int id; - @ObfuscatedName("dp") + @ObfuscatedName("dw") @ObfuscatedGetter( - intValue = 1511718677 + intValue = -2069383305 ) @Export("length") final int length; static { - field2706 = new ClientPacket(0, 0); - field2660 = new ClientPacket(1, -1); - field2737 = new ClientPacket(2, 4); - field2662 = new ClientPacket(3, 3); - field2663 = new ClientPacket(4, 7); - field2664 = new ClientPacket(5, 3); - field2665 = new ClientPacket(6, -1); - field2689 = new ClientPacket(7, 8); - field2667 = new ClientPacket(8, -2); - field2668 = new ClientPacket(9, 8); - field2690 = new ClientPacket(10, 1); - field2672 = new ClientPacket(11, 15); - field2711 = new ClientPacket(12, 3); - field2699 = new ClientPacket(13, 8); - field2673 = new ClientPacket(14, 2); - field2670 = new ClientPacket(15, 8); - field2727 = new ClientPacket(16, 0); - field2676 = new ClientPacket(17, -1); - field2677 = new ClientPacket(18, 8); - field2694 = new ClientPacket(19, -1); - field2766 = new ClientPacket(20, 8); - field2680 = new ClientPacket(21, 0); - field2681 = new ClientPacket(22, 15); - field2682 = new ClientPacket(23, 3); - field2688 = new ClientPacket(24, 8); - field2684 = new ClientPacket(25, 16); - field2758 = new ClientPacket(26, -1); - field2686 = new ClientPacket(27, -1); - field2687 = new ClientPacket(28, -1); - field2692 = new ClientPacket(29, 7); - field2675 = new ClientPacket(30, 13); - field2696 = new ClientPacket(31, -1); - field2685 = new ClientPacket(32, 8); - field2707 = new ClientPacket(33, 7); - field2748 = new ClientPacket(34, -1); - field2691 = new ClientPacket(35, 3); - field2693 = new ClientPacket(36, 2); - field2679 = new ClientPacket(37, -2); - field2697 = new ClientPacket(38, 0); - field2759 = new ClientPacket(39, 2); - field2713 = new ClientPacket(40, -1); - field2700 = new ClientPacket(41, 7); - field2701 = new ClientPacket(42, 7); - field2702 = new ClientPacket(43, 7); - field2703 = new ClientPacket(44, -1); - field2704 = new ClientPacket(45, -1); - field2671 = new ClientPacket(46, 16); - field2750 = new ClientPacket(47, 9); - field2742 = new ClientPacket(48, 4); - field2708 = new ClientPacket(49, 7); - field2709 = new ClientPacket(50, 3); - field2710 = new ClientPacket(51, 6); - field2683 = new ClientPacket(52, 7); - field2712 = new ClientPacket(53, 7); - field2719 = new ClientPacket(54, 14); - field2714 = new ClientPacket(55, 8); - field2705 = new ClientPacket(56, 8); - field2716 = new ClientPacket(57, 16); - field2717 = new ClientPacket(58, 11); - field2718 = new ClientPacket(59, 5); - field2666 = new ClientPacket(60, -1); - field2720 = new ClientPacket(61, 4); - field2695 = new ClientPacket(62, 3); - field2722 = new ClientPacket(63, 8); - field2723 = new ClientPacket(64, 4); - field2724 = new ClientPacket(65, -1); - field2725 = new ClientPacket(66, -1); - field2669 = new ClientPacket(67, 0); - field2721 = new ClientPacket(68, 3); - field2728 = new ClientPacket(69, 15); - field2729 = new ClientPacket(70, 3); - field2730 = new ClientPacket(71, 8); - field2731 = new ClientPacket(72, 8); - field2732 = new ClientPacket(73, 10); - field2733 = new ClientPacket(74, 3); - field2734 = new ClientPacket(75, 6); - field2735 = new ClientPacket(76, -2); - field2736 = new ClientPacket(77, 7); - field2678 = new ClientPacket(78, 3); - field2661 = new ClientPacket(79, -1); - field2739 = new ClientPacket(80, 4); - field2740 = new ClientPacket(81, 3); - field2741 = new ClientPacket(82, -1); - field2698 = new ClientPacket(83, 8); - field2743 = new ClientPacket(84, 8); - field2674 = new ClientPacket(85, -1); - field2745 = new ClientPacket(86, -1); - field2746 = new ClientPacket(87, -1); - field2747 = new ClientPacket(88, 11); - field2726 = new ClientPacket(89, 8); - field2749 = new ClientPacket(90, 3); - field2755 = new ClientPacket(91, 9); - field2751 = new ClientPacket(92, 2); - field2752 = new ClientPacket(93, 8); - field2753 = new ClientPacket(94, 11); - field2754 = new ClientPacket(95, -1); - field2738 = new ClientPacket(96, 8); - field2756 = new ClientPacket(97, -1); - field2757 = new ClientPacket(98, 2); - field2659 = new ClientPacket(99, 8); - field2715 = new ClientPacket(100, -1); - field2760 = new ClientPacket(101, 8); - field2761 = new ClientPacket(102, 3); - field2762 = new ClientPacket(103, 7); - field2763 = new ClientPacket(104, 15); - field2764 = new ClientPacket(105, 11); + field2734 = new ClientPacket(0, 8); // L: 5 + field2684 = new ClientPacket(1, -1); // L: 6 + field2757 = new ClientPacket(2, 2); // L: 7 + field2667 = new ClientPacket(3, 8); // L: 8 + field2668 = new ClientPacket(4, -1); + field2669 = new ClientPacket(5, 9); // L: 10 + field2693 = new ClientPacket(6, 7); // L: 11 + field2755 = new ClientPacket(7, 2); // L: 12 + field2672 = new ClientPacket(8, 3); // L: 13 + field2673 = new ClientPacket(9, 3); // L: 14 + field2745 = new ClientPacket(10, 5); // L: 15 + field2675 = new ClientPacket(11, -2); // L: 16 + field2676 = new ClientPacket(12, -1); // L: 17 + field2677 = new ClientPacket(13, 8); // L: 18 + field2713 = new ClientPacket(14, 0); // L: 19 + field2748 = new ClientPacket(15, 3); // L: 20 + field2680 = new ClientPacket(16, 10); // L: 21 + field2681 = new ClientPacket(17, 8); // L: 22 + field2682 = new ClientPacket(18, 8); // L: 23 + field2683 = new ClientPacket(19, 8); // L: 24 + field2699 = new ClientPacket(20, 4); // L: 25 + field2685 = new ClientPacket(21, 2); // L: 26 + field2686 = new ClientPacket(22, 8); // L: 27 + field2687 = new ClientPacket(23, 3); // L: 28 + field2688 = new ClientPacket(24, 13); // L: 29 + field2689 = new ClientPacket(25, 8); // L: 30 + field2715 = new ClientPacket(26, 8); // L: 31 + field2754 = new ClientPacket(27, 4); // L: 32 + field2750 = new ClientPacket(28, -1); // L: 33 + field2758 = new ClientPacket(29, -1); // L: 34 + field2692 = new ClientPacket(30, 3); // L: 35 + field2733 = new ClientPacket(31, 3); // L: 36 + field2696 = new ClientPacket(32, 3); // L: 37 + field2697 = new ClientPacket(33, 2); // L: 38 + field2698 = new ClientPacket(34, -1); // L: 39 + field2666 = new ClientPacket(35, -1); // L: 40 + field2700 = new ClientPacket(36, -1); // L: 41 + field2722 = new ClientPacket(37, 11); // L: 42 + field2739 = new ClientPacket(38, 4); // L: 43 + field2665 = new ClientPacket(39, 8); // L: 44 + field2704 = new ClientPacket(40, -1); // L: 45 + field2705 = new ClientPacket(41, 7); // L: 46 + field2694 = new ClientPacket(42, 8); // L: 47 + field2702 = new ClientPacket(43, 16); // L: 48 + field2708 = new ClientPacket(44, -1); // L: 49 + field2709 = new ClientPacket(45, 7); // L: 50 + field2710 = new ClientPacket(46, 3); // L: 51 + field2711 = new ClientPacket(47, 8); // L: 52 + field2712 = new ClientPacket(48, 0); // L: 53 + field2714 = new ClientPacket(49, 3); // L: 54 + field2679 = new ClientPacket(50, 4); // L: 55 + field2763 = new ClientPacket(51, 7); // L: 56 + field2716 = new ClientPacket(52, -2); // L: 57 + field2717 = new ClientPacket(53, 3); // L: 58 + field2718 = new ClientPacket(54, 8); // L: 59 + field2719 = new ClientPacket(55, 0); // L: 60 + field2720 = new ClientPacket(56, 4); // L: 61 + field2721 = new ClientPacket(57, -1); // L: 62 + field2695 = new ClientPacket(58, 14); // L: 63 + field2723 = new ClientPacket(59, 3); // L: 64 + field2724 = new ClientPacket(60, -2); // L: 65 + field2725 = new ClientPacket(61, 6); // L: 66 + field2726 = new ClientPacket(62, 0); // L: 67 + field2727 = new ClientPacket(63, 16); // L: 68 + field2761 = new ClientPacket(64, 6); // L: 69 + field2729 = new ClientPacket(65, 15); // L: 70 + field2730 = new ClientPacket(66, 3); // L: 71 + field2731 = new ClientPacket(67, 8); // L: 72 + field2732 = new ClientPacket(68, 7); // L: 73 + field2691 = new ClientPacket(69, 8); // L: 74 + field2707 = new ClientPacket(70, -1); // L: 75 + field2735 = new ClientPacket(71, 15); // L: 76 + field2736 = new ClientPacket(72, 9); // L: 77 + field2737 = new ClientPacket(73, -1); // L: 78 + field2738 = new ClientPacket(74, 15); // L: 79 + field2674 = new ClientPacket(75, -1); // L: 80 + field2671 = new ClientPacket(76, 8); // L: 81 + field2741 = new ClientPacket(77, 11); // L: 82 + field2742 = new ClientPacket(78, 0); // L: 83 + field2743 = new ClientPacket(79, 1); // L: 84 + field2744 = new ClientPacket(80, 7); // L: 85 + field2728 = new ClientPacket(81, 3); // L: 86 + field2670 = new ClientPacket(82, 8); // L: 87 + field2747 = new ClientPacket(83, -1); // L: 88 + field2690 = new ClientPacket(84, 7); // L: 89 + field2749 = new ClientPacket(85, -1); // L: 90 + field2767 = new ClientPacket(86, 7); // L: 91 + field2746 = new ClientPacket(87, -1); // L: 92 + field2752 = new ClientPacket(88, -1); // L: 93 + field2753 = new ClientPacket(89, 16); // L: 94 + field2664 = new ClientPacket(90, 7); // L: 95 + field2751 = new ClientPacket(91, 8); // L: 96 + field2756 = new ClientPacket(92, 15); // L: 97 + field2706 = new ClientPacket(93, 8); // L: 98 + field2740 = new ClientPacket(94, 8); // L: 99 + field2759 = new ClientPacket(95, -1); // L: 100 + field2703 = new ClientPacket(96, -1); // L: 101 + field2701 = new ClientPacket(97, 7); // L: 102 + field2762 = new ClientPacket(98, 2); // L: 103 + field2769 = new ClientPacket(99, 3); // L: 104 + field2764 = new ClientPacket(100, -1); // L: 105 + field2765 = new ClientPacket(101, -1); // L: 106 + field2766 = new ClientPacket(102, -1); // L: 107 + field2678 = new ClientPacket(103, 11); // L: 108 + field2768 = new ClientPacket(104, 7); // L: 109 + field2760 = new ClientPacket(105, 11); // L: 110 } ClientPacket(int var1, int var2) { - this.id = var1; - this.length = var2; + this.id = var1; // L: 115 + this.length = var2; // L: 116 + } // L: 117 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "34" + ) + public static boolean method4710(int var0) { + return (var0 & 1) != 0; // L: 9 } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(Lct;B)V", + garbageValue = "-54" + ) + static final void method4709(Actor var0) { + var0.isWalking = false; // L: 4458 + SequenceDefinition var1; + if (var0.movementSequence != -1) { // L: 4459 + var1 = MouseHandler.SequenceDefinition_get(var0.movementSequence); // L: 4460 + if (var1 != null && var1.frameIds != null) { // L: 4461 + ++var0.movementFrameCycle; // L: 4462 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4463 + var0.movementFrameCycle = 1; // L: 4464 + ++var0.movementFrame; // L: 4465 + Interpreter.method1872(var1, var0.movementFrame, var0.x, var0.y); // L: 4466 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 4468 + var0.movementFrameCycle = 0; // L: 4469 + var0.movementFrame = 0; // L: 4470 + Interpreter.method1872(var1, var0.movementFrame, var0.x, var0.y); // L: 4471 + } + } else { + var0.movementSequence = -1; // L: 4474 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1125) { // L: 4476 + if (var0.spotAnimationFrame < 0) { // L: 4477 + var0.spotAnimationFrame = 0; + } + + int var3 = BZip2State.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4478 + if (var3 != -1) { // L: 4479 + SequenceDefinition var2 = MouseHandler.SequenceDefinition_get(var3); // L: 4480 + if (var2 != null && var2.frameIds != null) { // L: 4481 + ++var0.spotAnimationFrameCycle; // L: 4482 + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4483 + var0.spotAnimationFrameCycle = 1; // L: 4484 + ++var0.spotAnimationFrame; // L: 4485 + Interpreter.method1872(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4486 + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4488 4489 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4492 + } + } else { + var0.spotAnimation = -1; // L: 4494 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4496 + var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4497 + if (var1.field1963 == 1 && var0.field1144 > 0 && var0.field1131 <= Client.cycle && var0.field1132 < Client.cycle) { // L: 4498 4499 + var0.sequenceDelay = 1; // L: 4500 + return; // L: 4501 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4505 + var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4506 + if (var1 != null && var1.frameIds != null) { // L: 4507 + ++var0.sequenceFrameCycle; // L: 4508 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4509 + var0.sequenceFrameCycle = 1; // L: 4510 + ++var0.sequenceFrame; // L: 4511 + Interpreter.method1872(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4512 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4514 + var0.sequenceFrame -= var1.frameCount; // L: 4515 + ++var0.field1116; // L: 4516 + if (var0.field1116 >= var1.field1962) { // L: 4517 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4518 + Interpreter.method1872(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4519 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field1958; // L: 4521 + } else { + var0.sequence = -1; // L: 4523 + } + } + + if (var0.sequenceDelay > 0) { // L: 4525 + --var0.sequenceDelay; + } + + } // L: 4526 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 425413e292..3eee81bb1a 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,3 +1,4 @@ +import java.lang.management.GarbageCollectorMXBean; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; @@ -7,71 +8,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cs") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1264543347 + intValue = 1485573005 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Lcg;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("f") + @ObfuscatedName("aj") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("s") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1347880583 + intValue = -884769931 ) @Export("windowMode") int windowMode; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("brightness") double brightness; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1221768457 + intValue = -162381111 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1926347 + intValue = 452159187 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1050317019 + intValue = 1910295805 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 526846849 + intValue = 1017713591 ) - int field1209; - @ObfuscatedName("g") + int field1182; + @ObfuscatedName("k") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 8; + ClientPreferences_optionCount = 8; // L: 11 } ClientPreferences() { @@ -82,280 +80,112 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1209 = -1; + this.field1182 = -1; this.parameters = new LinkedHashMap(); - this.method2197(true); - } + this.method2231(true); // L: 26 + } // L: 27 @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; - this.rememberedUsername = null; - this.hideUsername = false; - this.brightness = 0.8D; - this.musicVolume = 127; - this.soundEffectsVolume = 127; - this.areaSoundEffectsVolume = 127; - this.field1209 = -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.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.field1182 = -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.roofsHidden = true; } - if (var2 > 1) { - this.titleMusicDisabled = var1.readUnsignedByte() == 1; + if (var2 > 1) { // L: 40 + this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 41 } - if (var2 > 3) { - this.windowMode = var1.readUnsignedByte(); + if (var2 > 3) { // L: 43 + this.windowMode = var1.readUnsignedByte(); // L: 44 } - if (var2 > 2) { - int var3 = var1.readUnsignedByte(); + if (var2 > 2) { // L: 46 + int var3 = var1.readUnsignedByte(); // L: 47 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.readInt(); - int var6 = var1.readInt(); - this.parameters.put(var5, var6); + for (int var4 = 0; var4 < var3; ++var4) { // L: 48 + int var5 = var1.readInt(); // L: 49 + int var6 = var1.readInt(); // L: 50 + this.parameters.put(var5, var6); // L: 51 } } - if (var2 > 4) { - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); + if (var2 > 4) { // L: 54 + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 55 } - if (var2 > 5) { - this.hideUsername = var1.readBoolean(); + if (var2 > 5) { // L: 57 + this.hideUsername = var1.readBoolean(); // L: 58 } - if (var2 > 6) { - this.brightness = (double)var1.readUnsignedByte() / 100.0D; - this.musicVolume = var1.readUnsignedByte(); - this.soundEffectsVolume = var1.readUnsignedByte(); - this.areaSoundEffectsVolume = var1.readUnsignedByte(); + 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 > 7) { - this.field1209 = var1.readUnsignedByte(); + if (var2 > 7) { // L: 66 + this.field1182 = var1.readUnsignedByte(); // L: 67 } } else { - this.method2197(true); + this.method2231(true); // L: 36 } } else { - this.method2197(true); + this.method2231(true); // L: 31 } - } + } // L: 71 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-1937" + descriptor = "(ZI)V", + garbageValue = "-1940266105" ) - void method2197(boolean var1) { - } + void method2231(boolean var1) { + } // L: 73 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lot;", - garbageValue = "31" + descriptor = "(I)Lop;", + garbageValue = "2037390205" ) @Export("toBuffer") Buffer toBuffer() { - 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(); + 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 while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.writeInt((Integer)var3.getKey()); - var1.writeInt((Integer)var3.getValue()); + Entry var3 = (Entry)var2.next(); // L: 83 + var1.writeInt((Integer)var3.getKey()); // L: 85 + var1.writeInt((Integer)var3.getValue()); // L: 86 } - 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.field1209); - return var1; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)[Lid;", - garbageValue = "0" - ) - public static class240[] method2209() { - return new class240[]{class240.field2767, class240.field2768, class240.field2769, class240.field2770, class240.field2775, class240.field2772, class240.field2773, class240.field2774, class240.field2776, class240.field2771}; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Loy;IB)V", - garbageValue = "126" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - 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) { - var7 = Players.Players_indices[var4]; - if ((Players.field1247[var7] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = GrandExchangeEvent.method5402(var0); - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class92.readPlayerUpdate(var0, var7); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var7 = Players.Players_indices[var4]; - if ((Players.field1247[var7] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = GrandExchangeEvent.method5402(var0); - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class92.readPlayerUpdate(var0, var7); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var7 = Players.Players_emptyIndices[var4]; - if ((Players.field1247[var7] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = GrandExchangeEvent.method5402(var0); - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (ChatChannel.updateExternalPlayer(var0, var7)) { - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var7 = Players.Players_emptyIndices[var4]; - if ((Players.field1247[var7] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = GrandExchangeEvent.method5402(var0); - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (ChatChannel.updateExternalPlayer(var0, var7)) { - var10000 = Players.field1247; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var4 = 1; var4 < 2048; ++var4) { - var10000 = Players.field1247; - var10000[var4] = (byte)(var10000[var4] >> 1); - Player var5 = Client.players[var4]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; - } - } - - SoundCache.method781(var0); - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - } - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1927902759" - ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } + 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.field1182); // L: 95 + return var1; // L: 96 } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index eeab9415d0..2be7f32cb5 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -3,57 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("ee") @Implements("Clock") public abstract class Clock { - Clock() { - } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lee;" + ) + @Export("clock") + protected static Clock clock; - @ObfuscatedName("l") + Clock() { + } // L: 4 + + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-973245062" + garbageValue = "1421350581" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "904483746" + garbageValue = "1121035205" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("l") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "(IIII)J", - garbageValue = "1921148390" + descriptor = "(B)V", + garbageValue = "2" ) - static long method2870(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "932253973" - ) - static final int method2867(int var0, int var1) { - int var2 = SoundSystem.method758(var0 - 1, var1 - 1) + SoundSystem.method758(1 + var0, var1 - 1) + SoundSystem.method758(var0 - 1, 1 + var1) + SoundSystem.method758(1 + var0, 1 + var1); - int var3 = SoundSystem.method758(var0 - 1, var1) + SoundSystem.method758(var0 + 1, var1) + SoundSystem.method758(var0, var1 - 1) + SoundSystem.method758(var0, var1 + 1); - int var4 = SoundSystem.method758(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "21127071" - ) - public static void method2864() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - } + static final void method2960() { + if (Client.logoutTimer > 0) { // L: 3275 + SequenceDefinition.logOut(); // L: 3276 + } else { + Client.timer.method5978(); // L: 3279 + WorldMapData_1.updateGameState(40); // L: 3280 + Projectile.field915 = Client.packetWriter.getSocket(); // L: 3281 + Client.packetWriter.removeSocket(); // L: 3282 + } + } // L: 3277 3283 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 5740d5a1de..202c39487d 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,151 +1,154 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("fy") +@ObfuscatedName("fq") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -863278215 + intValue = 391726433 ) @Export("xInset") public int xInset; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1158840997 + intValue = -2116687229 ) @Export("yInset") public int yInset; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1894285167 + intValue = 1517170261 ) @Export("xSize") int xSize; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1814130475 + intValue = 1280119157 ) @Export("ySize") int ySize; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { - this.xInset = 0; - this.yInset = 0; - this.xSize = var1; - this.ySize = var2; - this.flags = new int[this.xSize][this.ySize]; - this.clear(); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1338719657" + garbageValue = "981190902" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { - for (int var2 = 0; var2 < this.ySize; ++var2) { - if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { - this.flags[var1][var2] = 16777216; + 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 } else { this.flags[var1][var2] = 16777215; } } } - } + } // L: 59 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1493195097" + garbageValue = "-696909470" ) - public void method3416(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; - var2 -= this.yInset; - if (var3 == 0) { - if (var4 == 0) { - this.setFlag(var1, var2, 128); - this.setFlag(var1 - 1, var2, 8); + public void method3465(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 } - if (var4 == 1) { - this.setFlag(var1, var2, 2); - this.setFlag(var1, var2 + 1, 32); + if (var4 == 1) { // L: 69 + this.setFlag(var1, var2, 2); // L: 70 + this.setFlag(var1, var2 + 1, 32); // L: 71 } - if (var4 == 2) { - this.setFlag(var1, var2, 8); - this.setFlag(var1 + 1, var2, 128); + if (var4 == 2) { // L: 73 + this.setFlag(var1, var2, 8); // L: 74 + this.setFlag(var1 + 1, var2, 128); // L: 75 } - if (var4 == 3) { - this.setFlag(var1, var2, 32); - this.setFlag(var1, var2 - 1, 2); + if (var4 == 3) { // L: 77 + this.setFlag(var1, var2, 32); // L: 78 + this.setFlag(var1, var2 - 1, 2); // L: 79 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlag(var1, var2, 1); - this.setFlag(var1 - 1, var2 + 1, 16); + 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 (var4 == 1) { - this.setFlag(var1, var2, 4); - this.setFlag(var1 + 1, var2 + 1, 64); + if (var4 == 1) { // L: 87 + this.setFlag(var1, var2, 4); // L: 88 + this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 } - if (var4 == 2) { - this.setFlag(var1, var2, 16); - this.setFlag(var1 + 1, var2 - 1, 1); + if (var4 == 2) { // L: 91 + this.setFlag(var1, var2, 16); // L: 92 + this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 } - if (var4 == 3) { - this.setFlag(var1, var2, 64); - this.setFlag(var1 - 1, var2 - 1, 4); + if (var4 == 3) { // L: 95 + this.setFlag(var1, var2, 64); // L: 96 + this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlag(var1, var2, 130); - this.setFlag(var1 - 1, var2, 8); - this.setFlag(var1, var2 + 1, 32); + 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 (var4 == 1) { - this.setFlag(var1, var2, 10); - this.setFlag(var1, var2 + 1, 32); - this.setFlag(var1 + 1, var2, 128); + 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 == 2) { - this.setFlag(var1, var2, 40); - this.setFlag(var1 + 1, var2, 128); - this.setFlag(var1, var2 - 1, 2); + 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 == 3) { - this.setFlag(var1, var2, 160); - this.setFlag(var1, var2 - 1, 2); - this.setFlag(var1 - 1, var2, 8); + 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 (var5) { - if (var3 == 0) { - if (var4 == 0) { - this.setFlag(var1, var2, 65536); - this.setFlag(var1 - 1, var2, 4096); + 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 (var4 == 1) { @@ -159,7 +162,7 @@ public class CollisionMap { } if (var4 == 3) { - this.setFlag(var1, var2, 16384); + this.setFlag(var1, var2, 16384); // L: 137 this.setFlag(var1, var2 - 1, 1024); } } @@ -172,7 +175,7 @@ public class CollisionMap { if (var4 == 1) { this.setFlag(var1, var2, 2048); - this.setFlag(var1 + 1, var2 + 1, 32768); + this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 } if (var4 == 2) { @@ -189,8 +192,8 @@ public class CollisionMap { if (var3 == 2) { if (var4 == 0) { this.setFlag(var1, var2, 66560); - this.setFlag(var1 - 1, var2, 4096); - this.setFlag(var1, var2 + 1, 16384); + this.setFlag(var1 - 1, var2, 4096); // L: 162 + this.setFlag(var1, var2 + 1, 16384); // L: 163 } if (var4 == 1) { @@ -199,7 +202,7 @@ public class CollisionMap { this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 2) { + if (var4 == 2) { // L: 170 this.setFlag(var1, var2, 20480); this.setFlag(var1 + 1, var2, 65536); this.setFlag(var1, var2 - 1, 1024); @@ -215,10 +218,10 @@ public class CollisionMap { } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "9" + descriptor = "(IIIIZI)V", + garbageValue = "-507434937" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -227,13 +230,13 @@ public class CollisionMap { var6 += 131072; } - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 187 + var2 -= this.yInset; // L: 188 - 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) { + 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 this.setFlag(var7, var8, var6); } } @@ -242,293 +245,394 @@ public class CollisionMap { } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-129108254" + garbageValue = "-1882493146" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 201 var10000[var2] |= 2097152; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-620411965" + descriptor = "(IIB)V", + garbageValue = "71" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 207 var10000[var2] |= 262144; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "2138839945" + garbageValue = "-1002118940" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 211 var10000[var2] |= var3; } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "2147107999" + garbageValue = "569667708" ) - public void method3388(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; - var2 -= this.yInset; - if (var3 == 0) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 128); - this.setFlagOff(var1 - 1, var2, 8); + public void method3470(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 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 2); - this.setFlagOff(var1, var2 + 1, 32); + if (var4 == 1) { // L: 222 + this.setFlagOff(var1, var2, 2); // L: 223 + this.setFlagOff(var1, var2 + 1, 32); // L: 224 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 8); - this.setFlagOff(var1 + 1, var2, 128); + if (var4 == 2) { // L: 226 + this.setFlagOff(var1, var2, 8); // L: 227 + this.setFlagOff(var1 + 1, var2, 128); // L: 228 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 32); - this.setFlagOff(var1, var2 - 1, 2); + if (var4 == 3) { // L: 230 + this.setFlagOff(var1, var2, 32); // L: 231 + this.setFlagOff(var1, var2 - 1, 2); // L: 232 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 1); - this.setFlagOff(var1 - 1, var2 + 1, 16); + 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 (var4 == 1) { - this.setFlagOff(var1, var2, 4); - this.setFlagOff(var1 + 1, var2 + 1, 64); + if (var4 == 1) { // L: 240 + this.setFlagOff(var1, var2, 4); // L: 241 + this.setFlagOff(var1 + 1, var2 + 1, 64); // L: 242 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 16); - this.setFlagOff(var1 + 1, var2 - 1, 1); + if (var4 == 2) { // L: 244 + this.setFlagOff(var1, var2, 16); // L: 245 + this.setFlagOff(var1 + 1, var2 - 1, 1); // L: 246 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 64); - this.setFlagOff(var1 - 1, var2 - 1, 4); + if (var4 == 3) { // L: 248 + this.setFlagOff(var1, var2, 64); // L: 249 + this.setFlagOff(var1 - 1, var2 - 1, 4); // L: 250 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 130); - this.setFlagOff(var1 - 1, var2, 8); - this.setFlagOff(var1, var2 + 1, 32); + 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 (var4 == 1) { - this.setFlagOff(var1, var2, 10); - this.setFlagOff(var1, var2 + 1, 32); - this.setFlagOff(var1 + 1, var2, 128); + 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 == 2) { - this.setFlagOff(var1, var2, 40); - this.setFlagOff(var1 + 1, var2, 128); - this.setFlagOff(var1, var2 - 1, 2); + 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 == 3) { - this.setFlagOff(var1, var2, 160); - this.setFlagOff(var1, var2 - 1, 2); - this.setFlagOff(var1 - 1, var2, 8); + 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 (var5) { - if (var3 == 0) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 65536); - this.setFlagOff(var1 - 1, var2, 4096); + 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 (var4 == 1) { - this.setFlagOff(var1, var2, 1024); - this.setFlagOff(var1, var2 + 1, 16384); + if (var4 == 1) { // L: 281 + this.setFlagOff(var1, var2, 1024); // L: 282 + this.setFlagOff(var1, var2 + 1, 16384); // L: 283 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 4096); - this.setFlagOff(var1 + 1, var2, 65536); + if (var4 == 2) { // L: 285 + this.setFlagOff(var1, var2, 4096); // L: 286 + this.setFlagOff(var1 + 1, var2, 65536); // L: 287 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 16384); - this.setFlagOff(var1, var2 - 1, 1024); + if (var4 == 3) { // L: 289 + this.setFlagOff(var1, var2, 16384); // L: 290 + this.setFlagOff(var1, var2 - 1, 1024); // L: 291 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 512); - this.setFlagOff(var1 - 1, var2 + 1, 8192); + 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 (var4 == 1) { - this.setFlagOff(var1, var2, 2048); - this.setFlagOff(var1 + 1, var2 + 1, 32768); + if (var4 == 1) { // L: 299 + this.setFlagOff(var1, var2, 2048); // L: 300 + this.setFlagOff(var1 + 1, var2 + 1, 32768); // L: 301 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 8192); - this.setFlagOff(var1 + 1, var2 - 1, 512); + if (var4 == 2) { // L: 303 + this.setFlagOff(var1, var2, 8192); // L: 304 + this.setFlagOff(var1 + 1, var2 - 1, 512); // L: 305 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 32768); - this.setFlagOff(var1 - 1, var2 - 1, 2048); + if (var4 == 3) { // L: 307 + this.setFlagOff(var1, var2, 32768); // L: 308 + this.setFlagOff(var1 - 1, var2 - 1, 2048); // L: 309 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 66560); - this.setFlagOff(var1 - 1, var2, 4096); - this.setFlagOff(var1, var2 + 1, 16384); + 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 (var4 == 1) { - this.setFlagOff(var1, var2, 5120); - this.setFlagOff(var1, var2 + 1, 16384); - this.setFlagOff(var1 + 1, var2, 65536); + 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 == 2) { - this.setFlagOff(var1, var2, 20480); - this.setFlagOff(var1 + 1, var2, 65536); - this.setFlagOff(var1, var2 - 1, 1024); + 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 == 3) { - this.setFlagOff(var1, var2, 81920); - this.setFlagOff(var1, var2 - 1, 1024); - this.setFlagOff(var1 - 1, var2, 4096); + 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 } } } - } + } // L: 335 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "-1861908598" + garbageValue = "230890481" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { - int var7 = 256; - if (var6) { + int var7 = 256; // L: 338 + if (var6) { // L: 339 var7 += 131072; } - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 340 + var2 -= this.yInset; // L: 341 int var8; - if (var5 == 1 || var5 == 3) { - var8 = var3; - var3 = var4; - var4 = var8; + if (var5 == 1 || var5 == 3) { // L: 342 + var8 = var3; // L: 343 + var3 = var4; // L: 344 + var4 = var8; // L: 345 } - for (var8 = var1; var8 < var3 + var1; ++var8) { - if (var8 >= 0 && var8 < this.xSize) { - for (int var9 = var2; var9 < var2 + var4; ++var9) { + 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 if (var9 >= 0 && var9 < this.ySize) { - this.setFlagOff(var8, var9, var7); + this.setFlagOff(var8, var9, var7); // L: 350 } } } } - } + } // L: 354 - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "866007927" + garbageValue = "265042064" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 357 var10000[var2] &= ~var3; - } + } // L: 358 - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1789984358" + garbageValue = "1834026790" ) - public void method3391(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + public void method3479(int var1, int var2) { + var1 -= this.xInset; // L: 361 + var2 -= this.yInset; // L: 362 + int[] var10000 = this.flags[var1]; // L: 363 var10000[var2] &= -262145; - } + } // L: 364 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-128" + descriptor = "(Lop;II)V", + garbageValue = "696499017" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field126 == KeyHandler.field139) { - return false; - } else { - class4.field13 = KeyHandler.field134[KeyHandler.field139]; - Skeleton.field2376 = KeyHandler.field133[KeyHandler.field139]; - KeyHandler.field139 = KeyHandler.field139 + 1 & 127; - return true; + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 127 + var2.size = var0.readUnsignedByte(); // L: 128 + var2.id = var0.readInt(); // L: 129 + var2.operations = new int[var2.size]; // L: 130 + var2.creationErrors = new int[var2.size]; // L: 131 + var2.fields = new Field[var2.size]; // L: 132 + var2.intReplaceValues = new int[var2.size]; // L: 133 + var2.methods = new Method[var2.size]; // L: 134 + var2.arguments = new byte[var2.size][][]; // L: 135 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 136 + try { + int var4 = var0.readUnsignedByte(); // L: 138 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 139 + if (var4 == 3 || var4 == 4) { // L: 149 + var5 = var0.readStringCp1252NullTerminated(); // L: 150 + var6 = var0.readStringCp1252NullTerminated(); // L: 151 + var7 = var0.readUnsignedByte(); // L: 152 + String[] var8 = new String[var7]; // L: 153 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 154 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 155 + byte[][] var10 = new byte[var7][]; // L: 156 + int var12; + if (var4 == 3) { // L: 157 + for (int var11 = 0; var11 < var7; ++var11) { // L: 158 + var12 = var0.readInt(); // L: 159 + var10[var11] = new byte[var12]; // L: 160 + var0.readBytes(var10[var11], 0, var12); // L: 161 + } + } + + var2.operations[var3] = var4; // L: 164 + Class[] var21 = new Class[var7]; // L: 165 + + for (var12 = 0; var12 < var7; ++var12) { // L: 166 + var21[var12] = WorldMapLabelSize.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = WorldMapLabelSize.loadClassFromDescriptor(var20); // L: 167 + if (WorldMapLabelSize.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 168 + throw new SecurityException(); + } + + Method[] var13 = WorldMapLabelSize.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 169 + Method[] var14 = var13; // L: 171 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 172 + Method var16 = var14[var15]; // L: 173 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 175 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 176 + if (var17.length == var21.length) { // L: 177 + boolean var18 = true; // L: 178 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 179 + if (var21[var19] != var17[var19]) { // L: 180 + var18 = false; // L: 181 + break; // L: 182 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 185 + var2.methods[var3] = var16; // L: 186 + } + } + } + } + + var2.arguments[var3] = var10; // L: 193 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 140 + var6 = var0.readStringCp1252NullTerminated(); // L: 141 + var7 = 0; // L: 142 + if (var4 == 1) { // L: 143 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 144 + var2.intReplaceValues[var3] = var7; // L: 145 + if (WorldMapLabelSize.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 146 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(WorldMapLabelSize.loadClassFromDescriptor(var5), var6); // L: 147 + } + } catch (ClassNotFoundException var24) { // L: 196 + var2.creationErrors[var3] = -1; // L: 197 + } catch (SecurityException var25) { // L: 199 + var2.creationErrors[var3] = -2; // L: 200 + } catch (NullPointerException var26) { // L: 202 + var2.creationErrors[var3] = -3; // L: 203 + } catch (Exception var27) { // L: 205 + var2.creationErrors[var3] = -4; // L: 206 + } catch (Throwable var28) { // L: 208 + var2.creationErrors[var3] = -5; // L: 209 } } - } - @ObfuscatedName("k") + class54.reflectionChecks.addFirst(var2); // L: 212 + } // L: 213 + + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1386632304" + descriptor = "(B)V", + garbageValue = "-67" ) - public static void method3417(int var0) { - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = null; - Skills.musicTrackGroupId = -1; - class137.musicTrackFileId = -1; - class247.musicTrackVolume = 0; - class247.musicTrackBoolean = false; - class247.pcmSampleLength = var0; - } + public static void method3492() { + ItemComposition.ItemDefinition_cached.clear(); // L: 548 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 549 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 550 + } // L: 551 - @ObfuscatedName("lc") + @ObfuscatedName("ff") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-90" + garbageValue = "121" ) - static void method3418(int var0) { - if (var0 != Client.loginState) { - Client.loginState = var0; + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + SequenceDefinition.logOut(); // L: 3194 + switch(var0) { // L: 3195 + case 1: + class275.method5201(24); // L: 3199 + class1.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3200 + break; + case 2: + class275.method5201(24); // L: 3207 + class1.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3208 } - } + + } // L: 3213 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 75633d76c0..198c7b998b 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,112 +4,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("ie") @Implements("Coord") public class Coord { - @ObfuscatedName("pe") - @ObfuscatedSignature( - descriptor = "Lmt;" - ) - static class353 field3013; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1806986797 + intValue = 530097433 ) @Export("plane") public int plane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -753316605 + intValue = 780251377 ) @Export("x") public int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 380498553 + intValue = 1509887785 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lic;)V" + descriptor = "(Lie;)V" ) public Coord(Coord var1) { - this.plane = var1.plane; - this.x = var1.x; - this.y = var1.y; - } + this.plane = var1.plane; // L: 15 + this.x = var1.x; // L: 16 + this.y = var1.y; // L: 17 + } // L: 18 public Coord(int var1, int var2, int var3) { - this.plane = var1; - this.x = var2; - this.y = var3; - } + this.plane = var1; // L: 9 + this.x = var2; // L: 10 + this.y = var3; // L: 11 + } // L: 12 public Coord(int var1) { - if (var1 == -1) { + if (var1 == -1) { // L: 21 this.plane = -1; } else { - this.plane = var1 >> 28 & 3; - this.x = var1 >> 14 & 16383; - this.y = var1 & 16383; + this.plane = var1 >> 28 & 3; // L: 23 + this.x = var1 >> 14 & 16383; // L: 24 + this.y = var1 & 16383; // L: 25 } - } + } // L: 27 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "14599100" + garbageValue = "-1761065408" ) @Export("packed") public int packed() { - int var2 = this.plane; - int var3 = this.x; - int var4 = this.y; - int var1 = var2 << 28 | var3 << 14 | var4; - return var1; + int var2 = this.plane; // L: 31 + int var3 = this.x; // L: 32 + int var4 = this.y; // L: 33 + int var1 = var2 << 28 | var3 << 14 | var4; // L: 35 + return var1; // L: 37 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lic;I)Z", - garbageValue = "1532243849" + descriptor = "(Lie;I)Z", + garbageValue = "-1713093595" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { + if (this.plane != var1.plane) { // L: 47 return false; - } else if (this.x != var1.x) { + } else if (this.x != var1.x) { // L: 48 return false; } else { - return this.y == var1.y; + return this.y == var1.y; // L: 49 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1257462561" + garbageValue = "-492056812" ) @Export("toString") String toString(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); - } - - public boolean equals(Object var1) { - if (this == var1) { - return true; - } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); - } + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 62 } public int hashCode() { return this.packed(); } + public boolean equals(Object var1) { + if (this == var1) { // L: 41 + return true; + } else { + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 42 43 + } + } + public String toString() { - return this.toString(","); + return this.toString(","); // L: 58 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-65" + ) + public static void method5011() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 50 + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 51 + } // L: 52 + + if (var0 == null) { // L: 53 + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 54 + } } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index b8a29bfc10..8d1ad03860 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,264 +4,178 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("aa") @Implements("Decimator") public class Decimator { - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 209733467 + intValue = -1492470375 ) @Export("inputRate") int inputRate; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1210066833 + intValue = 1711646651 ) @Export("outputRate") int outputRate; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("table") int[][] table; public Decimator(int var1, int var2) { - if (var2 != var1) { - int var4 = var1; - int var5 = var2; - if (var2 > var1) { - var4 = var2; - var5 = var1; + if (var2 != var1) { // L: 14 + int var4 = var1; // L: 16 + int var5 = var2; // L: 17 + if (var2 > var1) { // L: 19 + var4 = var2; // L: 21 + var5 = var1; // L: 22 } - while (var5 != 0) { - int var6 = var4 % var5; - var4 = var5; - var5 = var6; + while (var5 != 0) { // L: 24 + int var6 = var4 % var5; // L: 25 + var4 = var5; // L: 26 + var5 = var6; // L: 27 } - var1 /= var4; - var2 /= var4; - this.inputRate = var1; - this.outputRate = var2; - this.table = new int[var1][14]; + var1 /= var4; // L: 32 + var2 /= var4; // L: 33 + this.inputRate = var1; // L: 34 + this.outputRate = var2; // L: 35 + this.table = new int[var1][14]; // L: 36 - for (int var7 = 0; var7 < var1; ++var7) { - int[] var8 = this.table[var7]; - double var9 = (double)var7 / (double)var1 + 6.0D; - int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); - if (var11 < 0) { + for (int var7 = 0; var7 < var1; ++var7) { // L: 37 + int[] var8 = this.table[var7]; // L: 38 + double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 + int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 + if (var11 < 0) { // L: 41 var11 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); - if (var12 > 14) { + int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 + if (var12 > 14) { // L: 43 var12 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = ((double)var11 - var9) * 3.141592653589793D; - double var17 = var13; - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { + for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 + double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46 + double var17 = var13; // L: 47 + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 var17 = var13 * (Math.sin(var15) / var15); } - var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); - var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); + var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); // L: 49 + var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); // L: 50 } } } - } + } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "-52" + descriptor = "([BI)[B", + garbageValue = "-951677214" ) @Export("resample") byte[] resample(byte[] var1) { - 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; + if (this.table != null) { // L: 56 + int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 57 + int[] var3 = new int[var2]; // L: 58 + int var4 = 0; // L: 59 + int var5 = 0; // L: 60 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { - byte var7 = var1[var6]; - int[] var8 = this.table[var5]; + for (var6 = 0; var6 < var1.length; ++var6) { // L: 61 + byte var7 = var1[var6]; // L: 62 + int[] var8 = this.table[var5]; // L: 63 int var9; - for (var9 = 0; var9 < 14; ++var9) { + for (var9 = 0; var9 < 14; ++var9) { // L: 64 var3[var9 + var4] += var8[var9] * var7; } - var5 += this.outputRate; - var9 = var5 / this.inputRate; - var4 += var9; - var5 -= var9 * this.inputRate; + var5 += this.outputRate; // L: 65 + var9 = var5 / this.inputRate; // L: 66 + var4 += var9; // L: 67 + var5 -= var9 * this.inputRate; // L: 68 } - var1 = new byte[var2]; + var1 = new byte[var2]; // L: 70 - for (var6 = 0; var6 < var2; ++var6) { - int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { + for (var6 = 0; var6 < var2; ++var6) { // L: 71 + int var10 = var3[var6] + 32768 >> 16; // L: 72 + if (var10 < -128) { // L: 73 var1[var6] = -128; - } else if (var10 > 127) { + } else if (var10 > 127) { // L: 74 var1[var6] = 127; } else { - var1[var6] = (byte)var10; + var1[var6] = (byte)var10; // L: 75 } } } - return var1; + return var1; // L: 78 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "835574685" + garbageValue = "-441900901" ) @Export("scaleRate") int scaleRate(int var1) { - if (this.table != null) { + if (this.table != null) { // L: 82 var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } - return var1; + return var1; // L: 83 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "6" + descriptor = "(II)I", + garbageValue = "841868680" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + if (this.table != null) { // L: 87 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } - return var1; + return var1; // L: 88 } - @ObfuscatedName("k") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Lbc;Lbc;IZIZI)I", - garbageValue = "1027479972" + descriptor = "(IIIII)V", + garbageValue = "-2093832763" ) - static int method1024(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = VerticalAlignment.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = VerticalAlignment.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lay;I)V", - garbageValue = "1657277023" - ) - static void method1014(GameEngine var0) { - while (CollisionMap.isKeyDown()) { - if (class4.field13 == 13) { - Renderable.method4391(); - return; - } - - if (class4.field13 == 96) { - if (Login.worldSelectPage > 0 && WorldMapCacheName.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (class4.field13 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ByteArrayPool.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ItemContainer.getWidgetChild(var0, var1); // L: 9118 + if (var4 != null && var4.onTargetEnter != null) { // L: 9119 + ScriptEvent var5 = new ScriptEvent(); // L: 9120 + var5.widget = var4; // L: 9121 + var5.args = var4.onTargetEnter; // L: 9122 + Tile.runScriptEvent(var5); // L: 9123 } - if (MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(0, 0); - return; - } + Client.field627 = var3; // L: 9125 + Client.isSpellSelected = true; // L: 9126 + FontName.selectedSpellWidget = var0; // L: 9127 + Client.selectedSpellChildIndex = var1; // L: 9128 + class116.selectedSpellFlags = var2; // L: 9129 + class184.invalidateWidget(var4); // L: 9130 + } // L: 9131 - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(0, 1); - return; - } - - int var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(1, 1); - return; - } - - int var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(2, 1); - return; - } - - int var4 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class19.changeWorldSelectSorting(3, 1); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Renderable.method4391(); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = class386.World_worlds[Login.hoveredWorldIndex]; - World.changeWorld(var5); - Renderable.method4391(); - return; - } - - if (Login.worldSelectPage > 0 && WorldMapCacheName.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= WorldMapCacheName.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= MouseRecorder.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= MouseRecorder.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && ByteArrayPool.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Huffman.canvasWidth - ByteArrayPool.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Huffman.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= MouseRecorder.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= MouseRecorder.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - - } - - @ObfuscatedName("hh") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "572846346" + descriptor = "(I)Z", + garbageValue = "1138685196" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2734, Client.packetWriter.isaacCipher); - var2.packetBuffer.method6930(var1); - var2.packetBuffer.writeInt(var0); - Client.packetWriter.addNode(var2); + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10614 } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 45b905df77..68fb00b0e5 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,26 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mq") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lms;" + descriptor = "Lmq;" ) - static final DefaultsGroup field4011; - @ObfuscatedName("q") + static final DefaultsGroup field4002; + @ObfuscatedName("gq") @ObfuscatedGetter( - intValue = -989464317 + intValue = -1669753129 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -253275399 ) @Export("group") final int group; static { - field4011 = new DefaultsGroup(3); + field4002 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { - this.group = var1; - } + this.group = var1; // L: 8 + } // L: 9 + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1517479091" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5613 + int var3 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var2; // L: 5618 + var0 -= WorldMapSectionType.cameraX; // L: 5619 + var3 -= class174.cameraY; // L: 5620 + var1 -= class65.cameraZ; // L: 5621 + int var4 = Rasterizer3D.Rasterizer3D_sine[class121.cameraPitch]; // L: 5622 + int var5 = Rasterizer3D.Rasterizer3D_cosine[class121.cameraPitch]; // L: 5623 + int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapRegion.cameraYaw]; // L: 5624 + int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapRegion.cameraYaw]; // L: 5625 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5626 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5627 + var0 = var8; // L: 5628 + var8 = var3 * var5 - var4 * var1 >> 16; // L: 5629 + var1 = var5 * var1 + var4 * var3 >> 16; // L: 5630 + if (var1 >= 50) { // L: 5632 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5633 + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5634 + } else { + Client.viewportTempX = -1; // L: 5637 + Client.viewportTempY = -1; // L: 5638 + } + + } else { + Client.viewportTempX = -1; // L: 5614 + Client.viewportTempY = -1; // L: 5615 + } + } // L: 5616 5640 } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 3cdfb9dba6..5a0a68454d 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,163 +3,163 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hd") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("capacity") int capacity; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("remaining") int remaining; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llm;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lhu;" ) - class232 field2650; + class232 field2655; public DemotingHashTable(int var1, int var2) { - this.queue = new IterableDualNodeQueue(); - this.capacity = var1; - this.remaining = var1; + this.queue = new IterableDualNodeQueue(); // L: 11 + this.capacity = var1; // L: 19 + this.remaining = var1; // L: 20 int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 21 22 } - this.hashTable = new IterableNodeHashTable(var3); - } + this.hashTable = new IterableNodeHashTable(var3); // L: 23 + } // L: 24 public DemotingHashTable(int var1) { - this(var1, var1); - } + this(var1, var1); // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("get") public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); - if (var3 == null) { + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 + if (var3 == null) { // L: 28 return null; } else { - Object var4 = var3.get(); - if (var4 == null) { - var3.remove(); - var3.removeDual(); - this.remaining += var3.size; - return null; + 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 } else { - if (var3.isSoft()) { - DirectWrapper var5 = new DirectWrapper(var4, var3.size); - this.hashTable.put(var5, var3.key); - this.queue.add(var5); - var5.keyDual = 0L; - var3.remove(); - var3.removeDual(); + 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 } else { - this.queue.add(var3); - var3.keyDual = 0L; + this.queue.add(var3); // L: 45 + var3.keyDual = 0L; // L: 46 } - return var4; + return var4; // L: 48 } } } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); - this.removeWrapper(var3); - } + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 + this.removeWrapper(var3); // L: 53 + } // L: 54 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lik;)V" + descriptor = "(Lin;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { - var1.remove(); - var1.removeDual(); - this.remaining += var1.size; + if (var1 != null) { // L: 57 + var1.remove(); // L: 58 + var1.removeDual(); // L: 59 + this.remaining += var1.size; // L: 60 } - } + } // L: 62 - @ObfuscatedName("j") - public void method4588(Object var1, long var2) { - this.put(var1, var2, 1); - } + @ObfuscatedName("a") + public void method4673(Object var1, long var2) { + this.put(var1, var2, 1); // L: 65 + } // L: 66 - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { + if (var4 > this.capacity) { // L: 69 throw new IllegalStateException(); } else { - this.remove(var2); - this.remaining -= var4; + this.remove(var2); // L: 70 + this.remaining -= var4; // L: 71 - while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.removeLast(); - if (var5 == null) { - throw new RuntimeException(""); + while (this.remaining < 0) { // L: 72 + Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 73 + if (var5 == null) { // L: 74 + throw new RuntimeException(""); // L: 75 } - if (!var5.isSoft()) { + if (!var5.isSoft()) { // L: 77 } - this.removeWrapper(var5); - if (this.field2650 != null) { - this.field2650.method4582(var5.get()); + this.removeWrapper(var5); // L: 78 + if (this.field2655 != null) { // L: 79 + this.field2655.method4651(var5.get()); // L: 80 } } - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); - this.queue.add(var6); - var6.keyDual = 0L; + 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 } - } + } // L: 87 - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("demote") public void demote(int var1) { - 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; + 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 } - } 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(); + } 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 } } - } + } // L: 109 - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("clear") public void clear() { - this.queue.clear(); - this.hashTable.clear(); - this.remaining = this.capacity; - } + this.queue.clear(); // L: 112 + this.hashTable.clear(); // L: 113 + this.remaining = this.capacity; // L: 114 + } // L: 115 } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 0c361940ee..ec70d18a84 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,318 +4,203 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +@ObfuscatedName("nj") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("j") + public static short[] field4081; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 494741943 + intValue = 135680211 + ) + int field4083; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 416354637 + ) + int field4079; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1841262827 ) int field4080; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1419816355 - ) - int field4077; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1450703465 - ) - int field4081; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lnr;", - garbageValue = "-1957452301" + descriptor = "(I)Lnp;", + garbageValue = "-1940365419" ) @Export("get") public PlatformInfo get() { byte var1; - if (class13.formattedOperatingSystemName.startsWith("win")) { + if (class176.formattedOperatingSystemName.startsWith("win")) { // L: 15 var1 = 1; - } else if (class13.formattedOperatingSystemName.startsWith("mac")) { + } else if (class176.formattedOperatingSystemName.startsWith("mac")) { // L: 16 var1 = 2; - } else if (class13.formattedOperatingSystemName.startsWith("linux")) { + } else if (class176.formattedOperatingSystemName.startsWith("linux")) { // L: 17 var1 = 3; } else { - var1 = 4; + var1 = 4; // L: 18 } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); - } catch (Exception var27) { - var2 = ""; + var2 = System.getProperty("os.arch").toLowerCase(); // L: 22 + } catch (Exception var27) { // L: 24 + var2 = ""; // L: 25 } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); - } catch (Exception var26) { - var3 = ""; + var3 = System.getProperty("os.version").toLowerCase(); // L: 28 + } catch (Exception var26) { // L: 30 + var3 = ""; // L: 31 } - String var4 = "Unknown"; - String var5 = "1.1"; + String var4 = "Unknown"; // L: 33 + String var5 = "1.1"; // L: 34 try { - var4 = System.getProperty("java.vendor"); - var5 = System.getProperty("java.version"); - } catch (Exception var25) { + var4 = System.getProperty("java.vendor"); // L: 36 + var5 = System.getProperty("java.version"); // L: 37 + } catch (Exception var25) { // L: 39 } boolean var24; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { - var24 = false; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41 + var24 = false; // L: 42 } else { var24 = true; } - byte var7 = 0; - if (var1 == 1) { - if (var3.indexOf("4.0") != -1) { + byte var7 = 0; // L: 43 + if (var1 == 1) { // L: 44 + if (var3.indexOf("4.0") != -1) { // L: 45 var7 = 1; - } else if (var3.indexOf("4.1") != -1) { + } else if (var3.indexOf("4.1") != -1) { // L: 46 var7 = 2; - } else if (var3.indexOf("4.9") != -1) { + } else if (var3.indexOf("4.9") != -1) { // L: 47 var7 = 3; - } else if (var3.indexOf("5.0") != -1) { + } else if (var3.indexOf("5.0") != -1) { // L: 48 var7 = 4; - } else if (var3.indexOf("5.1") != -1) { + } else if (var3.indexOf("5.1") != -1) { // L: 49 var7 = 5; - } else if (var3.indexOf("5.2") != -1) { + } else if (var3.indexOf("5.2") != -1) { // L: 50 var7 = 8; - } else if (var3.indexOf("6.0") != -1) { + } else if (var3.indexOf("6.0") != -1) { // L: 51 var7 = 6; - } else if (var3.indexOf("6.1") != -1) { + } else if (var3.indexOf("6.1") != -1) { // L: 52 var7 = 7; - } else if (var3.indexOf("6.2") != -1) { + } else if (var3.indexOf("6.2") != -1) { // L: 53 var7 = 9; - } else if (var3.indexOf("6.3") != -1) { + } else if (var3.indexOf("6.3") != -1) { // L: 54 var7 = 10; - } else if (var3.indexOf("10.0") != -1) { + } else if (var3.indexOf("10.0") != -1) { // L: 55 var7 = 11; } - } else if (var1 == 2) { - if (var3.indexOf("10.4") != -1) { + } else if (var1 == 2) { // L: 57 + if (var3.indexOf("10.4") != -1) { // L: 58 var7 = 20; - } else if (var3.indexOf("10.5") != -1) { + } else if (var3.indexOf("10.5") != -1) { // L: 59 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { + } else if (var3.indexOf("10.6") != -1) { // L: 60 var7 = 22; - } else if (var3.indexOf("10.7") != -1) { + } else if (var3.indexOf("10.7") != -1) { // L: 61 var7 = 23; - } else if (var3.indexOf("10.8") != -1) { + } else if (var3.indexOf("10.8") != -1) { // L: 62 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { + } else if (var3.indexOf("10.9") != -1) { // L: 63 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { + } else if (var3.indexOf("10.10") != -1) { // L: 64 var7 = 26; - } else if (var3.indexOf("10.11") != -1) { + } else if (var3.indexOf("10.11") != -1) { // L: 65 var7 = 27; - } else if (var3.indexOf("10.12") != -1) { + } else if (var3.indexOf("10.12") != -1) { // L: 66 var7 = 28; - } else if (var3.indexOf("10.13") != -1) { + } else if (var3.indexOf("10.13") != -1) { // L: 67 var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { + if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70 var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71 var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { + } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72 var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { + } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73 var8 = 5; } else { - var8 = 4; + var8 = 4; // L: 74 } - this.method6371(var5); - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; + this.method6448(var5); // L: 75 + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field4080 > 3) { + if (this.field4083 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; + var11 = 0; // L: 81 } - byte var12 = 0; - String var13 = ""; - String var14 = ""; - String var15 = ""; - String var16 = ""; - String var17 = ""; - String var18 = ""; - int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field4080, this.field4077, this.field4081, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + byte var12 = 0; // L: 82 + String var13 = ""; // L: 83 + String var14 = ""; // L: 84 + String var15 = ""; // L: 85 + String var16 = ""; // L: 86 + String var17 = ""; // L: 87 + String var18 = ""; // L: 88 + int[] var23 = new int[3]; // L: 93 + return new PlatformInfo(var1, var24, var7, var8, this.field4083, this.field4079, this.field4080, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-366158740" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "51" ) - void method6371(String var1) { - if (var1.startsWith("1.")) { - this.method6367(var1); + void method6448(String var1) { + if (var1.startsWith("1.")) { // L: 101 + this.method6457(var1); // L: 102 } else { - this.method6373(var1); + this.method6451(var1); // L: 105 } - } + } // L: 107 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "271372899" + garbageValue = "1879411976" ) - void method6367(String var1) { - String[] var2 = var1.split("\\."); + void method6457(String var1) { + String[] var2 = var1.split("\\."); // L: 110 try { - this.field4080 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field4077 = Integer.parseInt(var2[0]); - this.field4081 = Integer.parseInt(var2[1]); - } catch (Exception var4) { + this.field4083 = Integer.parseInt(var2[1]); // L: 112 + var2 = var2[2].split("_"); // L: 113 + this.field4079 = Integer.parseInt(var2[0]); // L: 114 + this.field4080 = Integer.parseInt(var2[1]); // L: 115 + } catch (Exception var4) { // L: 117 } - } + } // L: 118 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1471158311" + garbageValue = "-615789988" ) - void method6373(String var1) { - String[] var2 = var1.split("\\."); + void method6451(String var1) { + String[] var2 = var1.split("\\."); // L: 121 try { - this.field4080 = Integer.parseInt(var2[0]); - this.field4077 = Integer.parseInt(var2[1]); - this.field4081 = Integer.parseInt(var2[2]); - } catch (Exception var4) { + this.field4083 = Integer.parseInt(var2[0]); // L: 123 + this.field4079 = Integer.parseInt(var2[1]); // L: 124 + this.field4080 = Integer.parseInt(var2[2]); // L: 125 + } catch (Exception var4) { // L: 127 } - } - - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1510567396" - ) - static final void method6380(int var0, int var1, boolean var2) { - if (!var2 || var0 != HealthBarDefinition.field1671 || WorldMapArea.field2053 != var1) { - HealthBarDefinition.field1671 = var0; - WorldMapArea.field2053 = var1; - UserList.updateGameState(25); - ScriptFrame.drawLoadingMessage("Loading - please wait.", true); - int var3 = WorldMapSectionType.baseX; - int var4 = PlayerComposition.baseY; - WorldMapSectionType.baseX = (var0 - 6) * 8; - PlayerComposition.baseY = (var1 - 6) * 8; - int var5 = WorldMapSectionType.baseX - var3; - int var6 = PlayerComposition.baseY - var4; - var3 = WorldMapSectionType.baseX; - var4 = PlayerComposition.baseY; - - int var7; - int var9; - int[] var10000; - 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; - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; - var19.y -= var6 * 128; - } - } - - 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; - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; - var22.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var8 = 104; - byte var21 = 1; - if (var5 < 0) { - var20 = 103; - var8 = -1; - var21 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { - for (var14 = var10; var11 != var14; var14 += var12) { - int var15 = var13 + var5; - int var16 = var14 + var6; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn 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) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - Canvas.cameraX -= var5 << 7; - VarpDefinition.cameraZ -= var6 << 7; - class132.oculusOrbFocalPointX -= var5 << 7; - LoginScreenAnimation.oculusOrbFocalPointY -= var6 << 7; - Client.field722 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } - } + } // L: 128 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 0176754cfa..fd591e8d59 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,114 +9,121 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("ag") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("format") AudioFormat format; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("line") SourceDataLine line; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1184801319 + intValue = 1458693003 ) @Export("capacity2") int capacity2; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { - } + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1783507069" + descriptor = "(B)V", + garbageValue = "54" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field279, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; - } + this.format = new AudioFormat((float)UserComparator2.field4359, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 + } // L: 23 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "15" + descriptor = "(II)V", + garbageValue = "122369223" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); - this.line = (SourceDataLine)AudioSystem.getLine(var2); - this.line.open(); - this.line.start(); - this.capacity2 = var1; - } catch (LineUnavailableException var3) { - if (WorldMapData_1.method3757(var1) != 1) { - this.open(InvDefinition.method2881(var1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 + this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 + this.line.open(); // L: 29 + this.line.start(); // L: 30 + this.capacity2 = var1; // L: 31 + } catch (LineUnavailableException var5) { // L: 33 + if (Tile.method4199(var1) != 1) { // L: 34 + int var4 = var1 - 1; // L: 38 + var4 |= var4 >>> 1; // L: 39 + var4 |= var4 >>> 2; // L: 40 + var4 |= var4 >>> 4; // L: 41 + var4 |= var4 >>> 8; // L: 42 + var4 |= var4 >>> 16; // L: 43 + int var3 = var4 + 1; // L: 44 + this.open(var3); // L: 46 } else { - this.line = null; - throw var3; + this.line = null; // L: 49 + throw var5; // L: 50 } } - } + } // L: 47 52 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-625452134" + garbageValue = "1689594693" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 55 } - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("write") protected void write() { - int var1 = 256; - if (PcmPlayer.PcmPlayer_stereo) { + int var1 = 256; // L: 60 + if (PcmPlayer.PcmPlayer_stereo) { // L: 61 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { - int var3 = super.samples[var2]; - if ((var3 + 8388608 & -16777216) != 0) { - var3 = 8388607 ^ var3 >> 31; + for (int var2 = 0; var2 < var1; ++var2) { // L: 62 + int var3 = super.samples[var2]; // L: 63 + if ((var3 + 8388608 & -16777216) != 0) { // L: 64 + var3 = 8388607 ^ var3 >> 31; // L: 65 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 67 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 68 } - this.line.write(this.byteSamples, 0, var1 << 1); - } + this.line.write(this.byteSamples, 0, var1 << 1); // L: 70 + } // L: 71 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1407514911" + garbageValue = "-1440644043" ) @Export("close") protected void close() { - if (this.line != null) { - this.line.close(); - this.line = null; + if (this.line != null) { // L: 74 + this.line.close(); // L: 75 + this.line = null; // L: 76 } - } + } // L: 78 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-115" + garbageValue = "-98" ) @Export("discard") protected void discard() { - this.line.flush(); - } + this.line.flush(); // L: 81 + } // L: 82 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 44da65102d..f9dfd67b55 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,61 +1,279 @@ +import java.io.File; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("h") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class45 { - @ObfuscatedName("l") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "[Low;" ) - @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; DevicePcmPlayerProvider() { - } + } // L: 7 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Laq;", - garbageValue = "666653269" + descriptor = "(S)Lak;", + garbageValue = "6712" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); + return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("l") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BZB)Ljava/lang/Object;", - garbageValue = "105" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnv;", + garbageValue = "1795857888" ) - public static Object method372(byte[] var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0.length > 136) { - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); - var2.set(var0); - return var2; - } else { - return var0; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 219 + if (var3.exists()) { // L: 220 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 222 + return var10; // L: 223 + } catch (IOException var9) { // L: 225 + } + } + + String var4 = ""; // L: 227 + if (JagexCache.cacheGamebuild == 33) { // L: 228 + var4 = "_rc"; + } else if (JagexCache.cacheGamebuild == 34) { // L: 229 + var4 = "_wip"; + } + + File var5 = new File(TriBool.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 230 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 231 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 233 + return var6; // L: 234 + } catch (IOException var8) { // L: 236 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 239 + return var6; // L: 240 + } catch (IOException var7) { // L: 242 + throw new RuntimeException(); // L: 243 } } - @ObfuscatedName("s") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1444491208" + descriptor = "(IIIIS)V", + garbageValue = "1000" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9322 + EnumComposition.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9323 + } + + long var4 = -1L; // L: 9326 + long var6 = -1L; // L: 9327 + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9332 + if (var8 >= var10) { // L: 9334 + if (-1L != var4) { // L: 9464 + var8 = class138.method2827(var4); // L: 9465 + int var9 = (int)(var4 >>> 7 & 127L); // L: 9468 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9471 + GraphicsObject.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 9472 + } + + return; // L: 9474 + } + + long var24 = Player.method2159(var8); // L: 9335 + if (var6 != var24) { // L: 9336 + label330: { + var6 = var24; // L: 9337 + int var13 = class54.method1111(var8); // L: 9338 + int var14 = TextureProvider.method4518(var8); // L: 9339 + long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9343 + int var16 = (int)(var17 >>> 14 & 3L); // L: 9345 + int var26 = SoundSystem.method787(var8); // L: 9350 + if (var16 == 2 && GameBuild.scene.getObjectFlags(GrandExchangeOfferTotalQuantityComparator.Client_plane, var13, var14, var24) >= 0) { // L: 9351 9352 + ObjectComposition var18 = KitDefinition.getObjectDefinition(var26); // L: 9353 + if (var18.transforms != null) { // L: 9354 + var18 = var18.transform(); + } + + if (var18 == null) { // L: 9355 + break label330; + } + + if (Client.isItemSelected == 1) { // L: 9356 + EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(65535) + var18.name, 1, var26, var13, var14); // L: 9357 + } else if (Client.isSpellSelected) { // L: 9360 + if ((class116.selectedSpellFlags & 4) == 4) { // L: 9361 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(65535) + var18.name, 2, var26, var13, var14); // L: 9362 + } + } else { + String[] var19 = var18.actions; // L: 9367 + if (var19 != null) { // L: 9368 + for (int var20 = 4; var20 >= 0; --var20) { // L: 9369 + if (var19[var20] != null) { // L: 9370 + short var21 = 0; // L: 9371 + if (var20 == 0) { // L: 9372 + var21 = 3; + } + + if (var20 == 1) { // L: 9373 + var21 = 4; + } + + if (var20 == 2) { // L: 9374 + var21 = 5; + } + + if (var20 == 3) { // L: 9375 + var21 = 6; + } + + if (var20 == 4) { // L: 9376 + var21 = 1001; + } + + EnumComposition.insertMenuItemNoShift(var19[var20], MouseHandler.colorStartTag(65535) + var18.name, var21, var26, var13, var14); // L: 9377 + } + } + } + + EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(65535) + var18.name, 1002, var18.id, var13, var14); // L: 9382 + } + } + + Player var22; + int var27; + NPC var28; + int var35; + int[] var36; + if (var16 == 1) { // L: 9387 + NPC var31 = Client.npcs[var26]; // L: 9388 + if (var31 == null) { // L: 9389 + break label330; + } + + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 9390 + for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9391 + var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9392 + if (var28 != null && var31 != var28 && var28.definition.size == 1 && var28.x == var31.x && var31.y == var28.y) { // L: 9393 + WorldMapScaleHandler.addNpcToMenu(var28, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; // L: 9395 + var36 = Players.Players_indices; // L: 9396 + + for (var35 = 0; var35 < var27; ++var35) { // L: 9397 + var22 = Client.players[var36[var35]]; // L: 9398 + if (var22 != null && var31.x == var22.x && var22.y == var31.y) { // L: 9399 + GraphicsObject.addPlayerToMenu(var22, var36[var35], var13, var14); + } + } + } + + WorldMapScaleHandler.addNpcToMenu(var31, var26, var13, var14); // L: 9402 + } + + if (var16 == 0) { // L: 9404 + Player var32 = Client.players[var26]; // L: 9405 + if (var32 == null) { // L: 9406 + break label330; + } + + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 9407 + for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9408 + var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9409 + if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { // L: 9410 + WorldMapScaleHandler.addNpcToMenu(var28, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; // L: 9412 + var36 = Players.Players_indices; // L: 9413 + + for (var35 = 0; var35 < var27; ++var35) { // L: 9414 + var22 = Client.players[var36[var35]]; // L: 9415 + if (var22 != null && var22 != var32 && var32.x == var22.x && var32.y == var22.y) { // L: 9416 + GraphicsObject.addPlayerToMenu(var22, var36[var35], var13, var14); + } + } + } + + if (var26 != Client.combatTargetPlayerIndex) { // L: 9419 + GraphicsObject.addPlayerToMenu(var32, var26, var13, var14); + } else { + var4 = var24; // L: 9420 + } + } + + if (var16 == 3) { // L: 9422 + NodeDeque var34 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var13][var14]; // L: 9423 + if (var34 != null) { // L: 9424 + for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 9425 9426 9459 + ItemComposition var37 = TaskHandler.ItemDefinition_get(var33.id); // L: 9427 + if (Client.isItemSelected == 1) { // L: 9428 + EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); // L: 9429 + } else if (Client.isSpellSelected) { // L: 9432 + if ((class116.selectedSpellFlags & 1) == 1) { // L: 9433 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); // L: 9434 + } + } else { + String[] var29 = var37.groundActions; // L: 9439 + + for (int var30 = 4; var30 >= 0; --var30) { // L: 9440 + if (var29 != null && var29[var30] != null) { // L: 9441 + byte var23 = 0; // L: 9442 + if (var30 == 0) { // L: 9443 + var23 = 18; + } + + if (var30 == 1) { // L: 9444 + var23 = 19; + } + + if (var30 == 2) { // L: 9445 + var23 = 20; + } + + if (var30 == 3) { // L: 9446 + var23 = 21; + } + + if (var30 == 4) { // L: 9447 + var23 = 22; + } + + EnumComposition.insertMenuItemNoShift(var29[var30], MouseHandler.colorStartTag(16748608) + var37.name, var23, var33.id, var13, var14); // L: 9448 + } else if (var30 == 2) { // L: 9451 + EnumComposition.insertMenuItemNoShift("Take", MouseHandler.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); // L: 9452 + } + } + + EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); // L: 9456 + } + } + } + } + } + } + + ++var8; // L: 9328 } } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 828e868a43..da0d9ec219 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,58 +1,63 @@ import java.nio.ByteBuffer; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jz") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 77516077 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lko;" ) - static int field3212; - @ObfuscatedName("l") + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("j") + static int[][] field3212; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("i") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)[B", - garbageValue = "-25" + garbageValue = "99" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; - this.directBuffer.position(0); - this.directBuffer.get(var1); - return var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "944891137" - ) - @Export("set") - public void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); - this.directBuffer.position(0); - this.directBuffer.put(var1); + 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 } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "333873398" + descriptor = "([BB)V", + garbageValue = "-48" ) - static int method5102(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + @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 + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1646184786" + ) + static final void method5179(int var0) { + if (class174.loadInterface(var0)) { // L: 11315 + class135.drawModelComponents(WorldMapSection1.Widget_interfaceComponents[var0], -1); // L: 11316 } - } + } // L: 11317 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 2bc8b64e3c..28780d24f5 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,27 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("it") +@ObfuscatedName("id") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("obj") Object obj; DirectWrapper(Object var1, int var2) { - super(var2); - this.obj = var1; - } + super(var2); // L: 7 + this.obj = var1; // L: 8 + } // L: 9 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("get") Object get() { - return this.obj; + return this.obj; // L: 12 } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isSoft") boolean isSoft() { - return false; + return false; // L: 16 } } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 3138955743..51fbf2a05b 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("nt") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cu") + @ObfuscatedName("cc") @Export("keyDual") public long keyDual; - @ObfuscatedName("cv") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cn") + @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("db") + @ObfuscatedName("cb") @Export("removeDual") public void removeDual() { - if (this.nextDual != null) { - this.nextDual.previousDual = this.previousDual; - this.previousDual.nextDual = this.nextDual; - this.previousDual = null; - this.nextDual = null; + 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 } - } + } // L: 14 } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 3551766bbc..e1d6d47fef 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,61 +3,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("ka") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("sentinel") DualNode sentinel; public DualNodeDeque() { - this.sentinel = new DualNode(); - this.sentinel.previousDual = this.sentinel; - this.sentinel.nextDual = this.sentinel; - } + this.sentinel = new DualNode(); // L: 6 + this.sentinel.previousDual = this.sentinel; // L: 9 + this.sentinel.nextDual = this.sentinel; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnt;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 14 var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; - var1.previousDual = this.sentinel; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } + 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 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnt;)V" ) @Export("addLast") public void addLast(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 22 var1.removeDual(); } - var1.nextDual = this.sentinel; - var1.previousDual = this.sentinel.previousDual; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lnu;" + descriptor = "()Lnt;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; - return var1 == this.sentinel ? null : var1; + DualNode var1 = this.sentinel.previousDual; // L: 30 + return var1 == this.sentinel ? null : var1; // L: 31 32 } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index eb10dc98d9..359caefe4e 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,99 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bn") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("l") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = 931990427 + intValue = -740824161 + ) + static int field942; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1547181131 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1382537175 + intValue = -1678803105 ) @Export("type") int type; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2141422723 + intValue = 625040997 ) @Export("orientation") int orientation; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 322731869 + intValue = 168532931 ) @Export("plane") int plane; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -378065101 + intValue = -636498467 ) @Export("x") int x; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1775120185 + intValue = 1279572157 ) @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lfe;" + descriptor = "Lfm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1429370351 + intValue = -1999016109 ) @Export("frame") int frame; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -369980751 + intValue = 1531671951 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLhi;)V" + descriptor = "(IIIIIIIZLhj;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; this.type = var2; this.orientation = var3; - this.plane = var4; + this.plane = var4; // L: 23 this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = KitDefinition.SequenceDefinition_get(var7); + this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var7); this.frame = 0; - this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field1961 == 0 && var9 != null && var9 instanceof DynamicObject) { - DynamicObject var10 = (DynamicObject)var9; - if (var10.sequenceDefinition == this.sequenceDefinition) { - this.frame = var10.frame; - this.cycleStart = var10.cycleStart; - return; + this.cycleStart = Client.cycle - 1; // L: 29 + if (this.sequenceDefinition.field1965 == 0 && var9 != null && var9 instanceof DynamicObject) { + DynamicObject var10 = (DynamicObject)var9; // L: 31 + if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 + this.frame = var10.frame; // L: 33 + this.cycleStart = var10.cycleStart; // L: 34 + return; // L: 35 } } - if (var8 && this.sequenceDefinition.frameCount != -1) { + if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38 this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } } - } + } // L: 43 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected final Model getModel() { @@ -106,19 +111,19 @@ public class DynamicObject extends Renderable { var1 = 100; } - label55: { + label54: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label55; + break label54; } - var1 -= this.sequenceDefinition.frameLengths[this.frame]; + var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 ++this.frame; } while(this.frame < this.sequenceDefinition.frameIds.length); this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 54 this.sequenceDefinition = null; } @@ -126,33 +131,245 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = class245.getObjectDefinition(this.id); - if (var12.transforms != null) { + ObjectComposition var12 = KitDefinition.getObjectDefinition(this.id); // L: 62 + if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } - if (var12 == null) { + if (var12 == null) { // L: 64 return null; } else { int var2; int var3; - if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; - var3 = var12.sizeY; + if (this.orientation != 1 && this.orientation != 3) { // L: 67 + var2 = var12.sizeX; // L: 72 + var3 = var12.sizeY; // L: 73 } else { - var2 = var12.sizeY; - var3 = var12.sizeX; + var2 = var12.sizeY; // L: 68 + var3 = var12.sizeX; // L: 69 } - int var4 = (var2 >> 1) + this.x; - int var5 = (var2 + 1 >> 1) + this.x; - int var6 = (var3 >> 1) + this.y; - int var7 = (var3 + 1 >> 1) + this.y; - int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var4][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); + int var4 = (var2 >> 1) + this.x; // L: 75 + int var5 = (var2 + 1 >> 1) + this.x; // L: 76 + int var6 = (var3 >> 1) + this.y; // L: 77 + int var7 = (var3 + 1 >> 1) + this.y; // L: 78 + int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79 + int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; // L: 80 + int var10 = (this.x << 7) + (var2 << 6); // L: 81 + int var11 = (this.y << 7) + (var3 << 6); // L: 82 + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-1313175336" + ) + public static String method2003(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 + } else { + int var3 = var2 + var1; // L: 17 + int var4 = 0; // L: 18 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 19 + CharSequence var9 = var0[var5]; // L: 20 + if (var9 == null) { // L: 21 + var4 += 4; + } else { + var4 += var9.length(); // L: 22 + } + } + + StringBuilder var8 = new StringBuilder(var4); // L: 24 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 25 + CharSequence var7 = var0[var6]; // L: 26 + if (var7 == null) { // L: 27 + var8.append("null"); + } else { + var8.append(var7); // L: 28 + } + } + + return var8.toString(); // L: 30 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Loj;I)I", + garbageValue = "-1853618931" + ) + static int method1998(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 350 + int var2; + if (var1 == 0) { // L: 352 + var2 = 0; + } else if (var1 == 1) { // L: 353 + var2 = var0.readBits(5); + } else if (var1 == 2) { // L: 354 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 355 + } + + return var2; // L: 356 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1555132909" + ) + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 + if (var4 == null) { // L: 40 + var4 = new ItemContainer(); // L: 41 + ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 + } + + if (var4.ids.length <= var1) { // L: 44 + int[] var5 = new int[var1 + 1]; // L: 45 + int[] var6 = new int[var1 + 1]; // L: 46 + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 + var5[var7] = var4.ids[var7]; // L: 48 + var6[var7] = var4.quantities[var7]; // L: 49 + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 + } + + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 + } + + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-339727725" + ) + static boolean method2001(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 857 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Lho;", + garbageValue = "-1655778063" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 + if (var1 != null) { // L: 182 + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 184 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 185 + boolean var5 = true; // L: 187 + int[] var6 = var3.getGroupFileIds(var0); // L: 188 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 189 + byte[] var8 = var3.getFile(var0, var6[var7]); // L: 190 + if (var8 == null) { // L: 191 + var5 = false; // L: 192 + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 195 + byte[] var10 = var4.getFile(var9, 0); // L: 198 + if (var10 == null) { // L: 199 + var5 = false; + } + } + } + + Frames var2; + if (!var5) { // L: 201 + var2 = null; // L: 202 + } else { + try { + var2 = new Frames(var3, var4, var0, false); // L: 206 + } catch (Exception var12) { // L: 208 + var2 = null; // L: 209 + } + } + + if (var2 != null) { // L: 213 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; // L: 214 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "1" + ) + static final int method2002(int var0, int var1) { + int var2 = class117.method2573(var0 - 1, var1 - 1) + class117.method2573(1 + var0, var1 - 1) + class117.method2573(var0 - 1, 1 + var1) + class117.method2573(var0 + 1, 1 + var1); // L: 557 + int var3 = class117.method2573(var0 - 1, var1) + class117.method2573(1 + var0, var1) + class117.method2573(var0, var1 - 1) + class117.method2573(var0, 1 + var1); // L: 558 + int var4 = class117.method2573(var0, var1); // L: 559 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 560 + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(IIII)Lcq;", + garbageValue = "-1244172652" + ) + static final InterfaceParent method1997(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11517 + var3.group = var1; // L: 11518 + var3.type = var2; // L: 11519 + Client.interfaceParents.put(var3, (long)var0); // L: 11520 + Player.Widget_resetModelFrames(var1); // L: 11521 + Widget var4 = UserComparator9.getWidget(var0); // L: 11522 + class184.invalidateWidget(var4); // L: 11523 + if (Client.meslayerContinueWidget != null) { // L: 11524 + class184.invalidateWidget(Client.meslayerContinueWidget); // L: 11525 + Client.meslayerContinueWidget = null; // L: 11526 + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11529 + if (class122.method2607(Client.menuOpcodes[var5])) { // L: 11530 + if (var5 < Client.menuOptionsCount - 1) { // L: 11531 + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11532 + Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11533 + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11534 + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11535 + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11536 + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11537 + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11538 + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11539 + } + } + + --var5; // L: 11542 + --Client.menuOptionsCount; // L: 11543 + } + } + + class262.method5136(); // L: 11546 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11548 + class54.runWidgetOnLoadListener(var1); // L: 11549 + if (Client.rootInterface != -1) { // L: 11550 + ItemComposition.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11551 + } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index e2f6b5acd3..6c47c57675 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -1,179 +1,301 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fi") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("EnumDefinition_archive") static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "[Loz;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("fs") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("inputType") public char inputType; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("outputType") public char outputType; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 803208305 + intValue = -1626628953 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -707506917 + intValue = -997141697 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("keys") public int[] keys; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("intVals") public int[] intVals; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("strVals") public String[] strVals; static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); + EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } EnumComposition() { - this.defaultStr = "null"; - this.outputCount = 0; + this.defaultStr = "null"; // L: 15 + this.outputCount = 0; // L: 17 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-247598772" + descriptor = "(Lop;I)V", + garbageValue = "-1999375204" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 == 0) { // L: 41 + return; // L: 44 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 42 } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-674446563" + descriptor = "(Lop;II)V", + garbageValue = "498308918" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 48 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 49 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 50 this.defaultInt = var1.readInt(); } else { int var3; - if (var2 == 5) { - this.outputCount = var1.readUnsignedShort(); - this.keys = new int[this.outputCount]; - this.strVals = new String[this.outputCount]; + if (var2 == 5) { // L: 51 + this.outputCount = var1.readUnsignedShort(); // L: 52 + this.keys = new int[this.outputCount]; // L: 53 + this.strVals = new String[this.outputCount]; // L: 54 - for (var3 = 0; var3 < this.outputCount; ++var3) { - this.keys[var3] = var1.readInt(); - this.strVals[var3] = var1.readStringCp1252NullTerminated(); + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 + this.keys[var3] = var1.readInt(); // L: 56 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 } - } else if (var2 == 6) { - this.outputCount = var1.readUnsignedShort(); - this.keys = new int[this.outputCount]; - this.intVals = new int[this.outputCount]; + } else if (var2 == 6) { // L: 60 + this.outputCount = var1.readUnsignedShort(); // L: 61 + this.keys = new int[this.outputCount]; // L: 62 + this.intVals = new int[this.outputCount]; // L: 63 - for (var3 = 0; var3 < this.outputCount; ++var3) { - this.keys[var3] = var1.readInt(); - this.intVals[var3] = var1.readInt(); + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 + this.keys[var3] = var1.readInt(); // L: 65 + this.intVals[var3] = var1.readInt(); // L: 66 } } } - } + } // L: 70 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2120023502" + garbageValue = "689416040" ) @Export("size") public int size() { - return this.outputCount; + return this.outputCount; // L: 73 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-358460107" + descriptor = "([BI)[B", + garbageValue = "211547863" ) - public static int method2998(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; + public static byte[] method3106(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 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1659130731" + ) + static void method3097(boolean var0) { + byte var1 = 0; // L: 878 + boolean var2 = class408.clientPreferences.field1182 >= Client.field467; // L: 881 + if (!var2) { // L: 883 + var1 = 12; // L: 884 + } else if (ArchiveLoader.client.method1166()) { // L: 886 + var1 = 10; // L: 887 } - } - @ObfuscatedName("q") + class275.method5201(var1); // L: 889 + if (var0) { // L: 890 + Login.Login_username = ""; // L: 891 + Login.Login_password = ""; // L: 892 + ReflectionCheck.field429 = 0; // L: 893 + Tiles.otp = ""; // L: 894 + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 897 + if (class408.clientPreferences.rememberedUsername != null) { // L: 898 + Login.Login_username = class408.clientPreferences.rememberedUsername; // L: 899 + Client.Login_isUsernameRemembered = true; // L: 900 + } else { + Client.Login_isUsernameRemembered = false; // L: 902 + } + } + + ParamComposition.method3216(); // L: 904 + } // L: 905 + + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "1964426544" + descriptor = "(IIZB)V", + garbageValue = "11" ) - static void method3007(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(JagexCache.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(""); + static final void method3107(int var0, int var1, boolean var2) { + if (!var2 || var0 != ItemLayer.field2243 || WallDecoration.field2630 != var1) { // L: 5791 + ItemLayer.field2243 = var0; // L: 5794 + WallDecoration.field2630 = var1; // L: 5795 + WorldMapData_1.updateGameState(25); // L: 5796 + class91.drawLoadingMessage("Loading - please wait.", true); // L: 5797 + int var3 = class19.baseX; // L: 5798 + int var4 = DefaultsGroup.baseY; // L: 5799 + class19.baseX = (var0 - 6) * 8; // L: 5800 + DefaultsGroup.baseY = (var1 - 6) * 8; // L: 5801 + int var5 = class19.baseX - var3; // L: 5802 + int var6 = DefaultsGroup.baseY - var4; // L: 5803 + var3 = class19.baseX; // L: 5804 + var4 = DefaultsGroup.baseY; // L: 5805 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5806 + NPC var19 = Client.npcs[var7]; // L: 5807 + if (var19 != null) { // L: 5808 + for (var9 = 0; var9 < 10; ++var9) { // L: 5809 + var10000 = var19.pathX; // L: 5810 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5811 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5813 + var19.y -= var6 * 128; // L: 5814 + } } - var2.write(var3.array, 0, var3.offset); - var2.close(); - } catch (IOException var4) { - var4.printStackTrace(); - } + for (var7 = 0; var7 < 2048; ++var7) { // L: 5817 + Player var22 = Client.players[var7]; // L: 5818 + if (var22 != null) { // L: 5819 + for (var9 = 0; var9 < 10; ++var9) { // L: 5820 + var10000 = var22.pathX; // L: 5821 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5822 + var10000[var9] -= var6; + } - } + var22.x -= var5 * 128; // L: 5824 + var22.y -= var6 * 128; // L: 5825 + } + } + + byte var20 = 0; // L: 5828 + byte var8 = 104; // L: 5829 + byte var21 = 1; // L: 5830 + if (var5 < 0) { // L: 5831 + var20 = 103; // L: 5832 + var8 = -1; // L: 5833 + var21 = -1; // L: 5834 + } + + byte var10 = 0; // L: 5836 + byte var11 = 104; // L: 5837 + byte var12 = 1; // L: 5838 + if (var6 < 0) { // L: 5839 + var10 = 103; // L: 5840 + var11 = -1; // L: 5841 + var12 = -1; // L: 5842 + } + + int var14; + for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5844 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5845 + int var15 = var13 + var5; // L: 5846 + int var16 = var6 + var14; // L: 5847 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5848 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5849 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5850 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5854 5855 5859 + var18.x -= var5; // L: 5856 + var18.y -= var6; // L: 5857 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5858 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5861 + Client.destinationX -= var5; // L: 5862 + Client.destinationY -= var6; // L: 5863 + } + + Client.soundEffectCount = 0; // L: 5865 + Client.isCameraLocked = false; // L: 5866 + WorldMapSectionType.cameraX -= var5 << 7; // L: 5867 + class65.cameraZ -= var6 << 7; // L: 5868 + class320.oculusOrbFocalPointX -= var5 << 7; // L: 5869 + class18.oculusOrbFocalPointY -= var6 << 7; // L: 5870 + Client.field701 = -1; // L: 5871 + Client.graphicsObjects.clear(); // L: 5872 + Client.projectiles.clear(); // L: 5873 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5874 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5792 5875 + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "1038996465" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + ModelData0.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9294 + } // L: 9295 } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index c990b55f07..c091ad8ae3 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,101 +3,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("ig") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) - DualNode field2655; - @ObfuscatedName("q") + DualNode field2657; + @ObfuscatedName("w") @Export("capacity") int capacity; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llm;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2655 = new DualNode(); - this.deque = new IterableDualNodeQueue(); - this.capacity = var1; - this.remainingCapacity = var1; + this.field2657 = new DualNode(); // L: 8 + this.deque = new IterableDualNodeQueue(); // L: 12 + this.capacity = var1; // L: 15 + this.remainingCapacity = var1; // L: 16 int var2; - for (var2 = 1; var2 + var2 < var1; var2 += var2) { + for (var2 = 1; var2 + var2 < var1; var2 += var2) { // L: 17 18 } - this.hashTable = new IterableNodeHashTable(var2); - } + this.hashTable = new IterableNodeHashTable(var2); // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(J)Lnu;" + descriptor = "(J)Lnt;" ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); - if (var3 != null) { - this.deque.add(var3); + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 + if (var3 != null) { // L: 24 + this.deque.add(var3); // L: 25 } - return var3; + return var3; // L: 28 } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("remove") public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); - if (var3 != null) { - var3.remove(); - var3.removeDual(); - ++this.remainingCapacity; + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 + if (var3 != null) { // L: 33 + var3.remove(); // L: 34 + var3.removeDual(); // L: 35 + ++this.remainingCapacity; // L: 36 } - } + } // L: 38 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnu;J)V" + descriptor = "(Lnt;J)V" ) @Export("put") public void put(DualNode var1, long var2) { - if (this.remainingCapacity == 0) { - DualNode var4 = this.deque.removeLast(); - var4.remove(); - var4.removeDual(); - if (var4 == this.field2655) { - var4 = this.deque.removeLast(); - var4.remove(); - var4.removeDual(); + if (this.remainingCapacity == 0) { // L: 41 + DualNode var4 = this.deque.removeLast(); // L: 42 + var4.remove(); // L: 43 + var4.removeDual(); // L: 44 + if (var4 == this.field2657) { // L: 45 + var4 = this.deque.removeLast(); // L: 46 + var4.remove(); // L: 47 + var4.removeDual(); // L: 48 } } else { - --this.remainingCapacity; + --this.remainingCapacity; // L: 51 } - this.hashTable.put(var1, var2); - this.deque.add(var1); - } + this.hashTable.put(var1, var2); // L: 52 + this.deque.add(var1); // L: 53 + } // L: 54 - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("clear") public void clear() { - this.deque.clear(); - this.hashTable.clear(); - this.field2655 = new DualNode(); - this.remainingCapacity = this.capacity; - } + this.deque.clear(); // L: 57 + this.hashTable.clear(); // L: 58 + this.field2657 = new DualNode(); // L: 59 + this.remainingCapacity = this.capacity; // L: 60 + } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index b91f56ed98..341b678107 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,37 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("hq") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -976866649 + intValue = 114850491 ) @Export("x") int x; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1457506575 + intValue = 2059790001 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2004790059 + intValue = 1654198693 ) @Export("z") int z; FaceNormal() { - } + } // L: 8 - @ObfuscatedName("l") + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "859115015" + descriptor = "(Lcx;IIB)V", + garbageValue = "-51" ) - public static int method4396(int var0, int var1) { - return (var0 << 8) + var1; - } + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4529 + int var3 = MouseHandler.SequenceDefinition_get(var1).field1965; // L: 4530 + if (var3 == 1) { // L: 4531 + var0.sequenceFrame = 0; // L: 4532 + var0.sequenceFrameCycle = 0; // L: 4533 + var0.sequenceDelay = var2; // L: 4534 + var0.field1116 = 0; // L: 4535 + } + + if (var3 == 2) { // L: 4537 + var0.field1116 = 0; // L: 4538 + } + } else if (var1 == -1 || var0.sequence == -1 || MouseHandler.SequenceDefinition_get(var1).field1959 >= MouseHandler.SequenceDefinition_get(var0.sequence).field1959) { // L: 4541 + var0.sequence = var1; // L: 4542 + var0.sequenceFrame = 0; // L: 4543 + var0.sequenceFrameCycle = 0; // L: 4544 + var0.sequenceDelay = var2; // L: 4545 + var0.field1116 = 0; // L: 4546 + var0.field1144 = var0.pathLength; // L: 4547 + } + + } // L: 4549 } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 50f756dd7b..1bbc7b86be 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -5,42 +5,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("ez") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("l") + @ObfuscatedName("po") + @ObfuscatedSignature( + descriptor = "Lno;" + ) + static class387 field1564; + @ObfuscatedName("i") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; static { - FileSystem_hasPermissions = false; + FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); - } + } // L: 9 - @ObfuscatedName("a") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "469084024" + descriptor = "(IIII)Low;", + garbageValue = "-2058198182" ) - static boolean method2820(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; + static SpritePixels method2909(int var0, int var1, int var2) { + return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(NetSocket.method2923(var0, var1, var2)); // L: 42 } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-322420667" + ) + public static void method2908() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90 + } // L: 91 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index 5494044ccb..5651141621 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") +@ObfuscatedName("om") @Implements("FillMode") public enum FillMode implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Lom;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Lom;" ) - field4366(1, 1), - @ObfuscatedName("f") + field4378(1, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Lom;" ) - field4368(2, 2); + field4377(2, 2); - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 496856367 + intValue = 2036544943 ) - public final int field4369; - @ObfuscatedName("m") + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -603011481 + intValue = -1855010985 ) - final int field4367; + public final int field4379; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1812864379 + ) + final int field4380; FillMode(int var3, int var4) { - this.field4369 = var3; - this.field4367 = var4; - } + this.field4379 = var3; // L: 19 + this.field4380 = var4; // L: 20 + } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4367; + return this.field4380; // L: 24 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index ca0bd3ec99..d3ecb3c988 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -3,197 +3,66 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gv") +@ObfuscatedName("gq") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 991061131 + intValue = -1221894569 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1601758079 + intValue = 1725833807 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 782571425 + intValue = 636569371 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -8680779531833759789L + longValue = -3843450359883300141L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1317615523 + intValue = -1362157209 ) @Export("flags") int flags; FloorDecoration() { - } + } // L: 11 - @ObfuscatedName("l") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class320.base37Table[(int)(var6 - var0 * 37L)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "557899168" + descriptor = "(II)Lpz;", + garbageValue = "1947599529" ) - static int method4104(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - int var11 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = HealthBarUpdate.getWidget(var9); - if (var6.children == null) { - var6.children = new Widget[var11 + 1]; - } + public static PrivateChatMode method4189(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4425, PrivateChatMode.field4423, PrivateChatMode.field4422}; // L: 18 + PrivateChatMode[] var2 = var1; // L: 20 - if (var6.children.length <= var11) { - Widget[] var7 = new Widget[var11 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { - throw new RuntimeException("" + (var11 - 1)); - } else { - 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) { - WorldMapDecoration.scriptDotWidget = var12; - } else { - class245.scriptActiveWidget = var12; - } - - class16.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { - var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - Widget var10 = HealthBarUpdate.getWidget(var3.id); - var10.children[var3.childIndex] = null; - class16.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - var3.children = null; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == 103) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - return 1; - } else if (var0 == 104) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var3 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - if (var2) { - WorldMapDecoration.scriptDotWidget = var3; - } else { - class245.scriptActiveWidget = var3; - } - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 202) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] = 0; - return 1; - } else if (var0 == 203) { - Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize + 1] = 0; - return 1; - } else { - return 2; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Widget var5 = ViewportMouse.getWidgetChild(var9, var4); - if (var5 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - if (var2) { - WorldMapDecoration.scriptDotWidget = var5; - } else { - class245.scriptActiveWidget = var5; - } - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 + PrivateChatMode var4 = var2[var3]; // L: 22 + if (var0 == var4.field4424) { // L: 24 + return var4; } } + + return null; // L: 28 } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index a512d3a850..a9a063de00 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,217 +4,291 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fu") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 277028007 + intValue = -895663505 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1201778655 + intValue = 1431978933 ) @Export("texture") public int texture; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1687723845 + intValue = 1633990945 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2057236633 + intValue = 1872138701 ) @Export("hue") public int hue; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 115242175 + intValue = -1122011313 ) @Export("saturation") public int saturation; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -636729447 + intValue = 358729949 ) @Export("lightness") public int lightness; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -566217293 + intValue = 1228616867 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 904207115 + intValue = -1504346497 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 445278127 + intValue = 2075535817 ) @Export("secondaryLightness") public int secondaryLightness; static { - FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public FloorOverlayDefinition() { - this.primaryRgb = 0; - this.texture = -1; - this.hideUnderlay = true; - this.secondaryRgb = -1; - } + FloorOverlayDefinition() { + this.primaryRgb = 0; // L: 12 + this.texture = -1; // L: 13 + this.hideUnderlay = true; // L: 14 + this.secondaryRgb = -1; // L: 15 + } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1537548599" + descriptor = "(B)V", + garbageValue = "0" ) @Export("postDecode") - public void postDecode() { - if (this.secondaryRgb != -1) { - this.setHsl(this.secondaryRgb); - this.secondaryHue = this.hue; - this.secondarySaturation = this.saturation; - this.secondaryLightness = this.lightness; + 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 } - this.setHsl(this.primaryRgb); - } + this.setHsl(this.primaryRgb); // L: 43 + } // L: 44 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-396376326" + descriptor = "(Lop;II)V", + garbageValue = "-730203033" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; + int var3 = var1.readUnsignedByte(); // L: 48 + if (var3 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 50 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;III)V", - garbageValue = "2051623974" + descriptor = "(Lop;III)V", + garbageValue = "641310816" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { + if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { + this.texture = var1.readUnsignedByte(); // L: 56 + } else if (var2 == 5) { // L: 57 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { + this.secondaryRgb = var1.readMedium(); // L: 58 + } else if (var2 == 8) { // L: 59 } - } + } // L: 61 - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1202743060" + descriptor = "(IB)V", + garbageValue = "-1" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; - double var8 = var2; - if (var4 < var2) { + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 + 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 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 69 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 70 + if (var4 > var2) { // L: 71 var10 = var4; } - if (var6 > var10) { + if (var6 > var10) { // L: 72 var10 = var6; } - double var12 = 0.0D; - double var14 = 0.0D; - double var16 = (var10 + var8) / 2.0D; - if (var10 != var8) { - if (var16 < 0.5D) { - var14 = (var10 - var8) / (var10 + var8); + double var12 = 0.0D; // L: 73 + double var14 = 0.0D; // L: 74 + double var16 = (var10 + var8) / 2.0D; // L: 75 + if (var10 != var8) { // L: 76 + if (var16 < 0.5D) { // L: 77 + var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { + if (var16 >= 0.5D) { // L: 78 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { // L: 79 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + } else if (var4 == var10) { // L: 80 + var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var6 == var10) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 } } - var12 /= 6.0D; - this.hue = (int)(256.0D * var12); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); - if (this.saturation < 0) { + var12 /= 6.0D; // L: 83 + this.hue = (int)(var12 * 256.0D); // L: 84 + this.saturation = (int)(var14 * 256.0D); // L: 85 + this.lightness = (int)(var16 * 256.0D); // L: 86 + if (this.saturation < 0) { // L: 87 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 88 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 89 this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 90 this.lightness = 255; } + } // L: 91 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)Lfi;", + garbageValue = "1313428327" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumComposition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 + } } - @ObfuscatedName("l") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "403924203" + descriptor = "([BIIIIIII[Lfq;I)V", + garbageValue = "1444717536" ) - public static int method3343(int var0) { - return class245.field2899[var0]; - } + static final void method3427(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { // L: 95 + for (var10 = 0; var10 < 8; ++var10) { // L: 96 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 97 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var3 + var10] &= -16777217; + } + } + } + + Buffer var28 = new Buffer(var0); // L: 100 + + for (var10 = 0; var10 < 4; ++var10) { // L: 101 + for (int var11 = 0; var11 < 64; ++var11) { // L: 102 + for (int var12 = 0; var12 < 64; ++var12) { // L: 103 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 104 + int var17 = var11 & 7; // L: 109 + int var18 = var12 & 7; // L: 110 + int var19 = var7 & 3; // L: 113 + int var16; + if (var19 == 0) { // L: 114 + var16 = var17; // L: 115 + } else if (var19 == 1) { // L: 118 + var16 = var18; // L: 119 + } else if (var19 == 2) { // L: 122 + var16 = 7 - var17; // L: 123 + } else { + var16 = 7 - var18; // L: 126 + } + + int var22 = var16 + var2; // L: 130 + int var25 = var11 & 7; // L: 133 + int var26 = var12 & 7; // L: 134 + int var27 = var7 & 3; // L: 137 + int var24; + if (var27 == 0) { // L: 138 + var24 = var26; // L: 139 + } else if (var27 == 1) { // L: 142 + var24 = 7 - var25; // L: 143 + } else if (var27 == 2) { // L: 146 + var24 = 7 - var26; // L: 147 + } else { + var24 = var25; // L: 150 + } + + GameEngine.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); // L: 152 + } else { + GameEngine.loadTerrain(var28, 0, -1, -1, 0, 0, 0); // L: 154 + } + } + } + } + + } // L: 158 } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 0b8c766363..cd41ae0660 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("fp") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("FloorUnderlayDefinition_archive") - static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("q") + public static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -532200839 + intValue = -775773749 ) @Export("rgb") int rgb; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 942035901 + intValue = -842998907 ) @Export("hue") public int hue; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1219525369 + intValue = 2077270313 ) @Export("saturation") public int saturation; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1599217659 + intValue = 1956452595 ) @Export("lightness") public int lightness; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1588498639 + intValue = 660177459 ) @Export("hueMultiplier") public int hueMultiplier; @@ -54,155 +54,137 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - FloorUnderlayDefinition() { + public FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1183298699" - ) - @Export("postDecode") - void postDecode() { - this.setHsl(this.rgb); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "-91" - ) - @Export("decode") - void decode(Buffer var1, int var2) { - while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; - } - - this.decodeNext(var1, var3, var2); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lot;IIB)V", - garbageValue = "64" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { - this.rgb = var1.readMedium(); - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "156508648" - ) - @Export("setHsl") - void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; - double var8 = var2; - if (var4 < var2) { - var8 = var4; - } - - if (var6 < var8) { - var8 = var6; - } - - double var10 = var2; - if (var4 > var2) { - var10 = var4; - } - - if (var6 > var10) { - var10 = var6; - } - - 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) { - var14 = (var10 - var8) / (2.0D - var10 - var8); - } - - if (var2 == var10) { - var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); - } - } - - var12 /= 6.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) { - this.saturation = 255; - } - - if (this.lightness < 0) { - this.lightness = 0; - } else if (this.lightness > 255) { - this.lightness = 255; - } - - if (var16 > 0.5D) { - this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); - } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); - } - - if (this.hueMultiplier < 1) { - this.hueMultiplier = 1; - } - - this.hue = (int)(var12 * (double)this.hueMultiplier); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "970537085" - ) - static int method3082() { - return ++Messages.Messages_count - 1; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1547670784" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-793299621" + descriptor = "(I)V", + garbageValue = "2098968671" ) - static final void method3094(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); - GraphicsDefaults.addGameMessage(30, "", var1); + @Export("postDecode") + public void postDecode() { + this.setHsl(this.rgb); // L: 19 + } // L: 20 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lop;II)V", + garbageValue = "-1624898788" + ) + @Export("decode") + public void decode(Buffer var1, int var2) { + while (true) { + int var3 = var1.readUnsignedByte(); // L: 24 + if (var3 == 0) { // L: 25 + return; // L: 28 + } + + this.decodeNext(var1, var3, var2); // L: 26 + } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lop;III)V", + garbageValue = "1243167673" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { + if (var2 == 1) { // L: 31 + this.rgb = var1.readMedium(); + } + + } // L: 33 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "44" + ) + @Export("setHsl") + void setHsl(int var1) { + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 36 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37 + double var6 = (double)(var1 & 255) / 256.0D; // L: 38 + double var8 = var2; // L: 39 + if (var4 < var2) { // L: 40 + var8 = var4; + } + + if (var6 < var8) { // L: 41 + var8 = var6; + } + + double var10 = var2; // L: 42 + if (var4 > var2) { // L: 43 + var10 = var4; + } + + if (var6 > var10) { // L: 44 + var10 = var6; + } + + double var12 = 0.0D; // L: 45 + double var14 = 0.0D; // L: 46 + double var16 = (var10 + var8) / 2.0D; // L: 47 + if (var8 != var10) { // L: 48 + if (var16 < 0.5D) { // L: 49 + var14 = (var10 - var8) / (var8 + var10); + } + + if (var16 >= 0.5D) { // L: 50 + var14 = (var10 - var8) / (2.0D - var10 - var8); + } + + if (var10 == var2) { // L: 51 + var12 = (var4 - var6) / (var10 - var8); + } else if (var10 == var4) { // L: 52 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var6 == var10) { + var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 53 + } + } + + var12 /= 6.0D; // L: 55 + this.saturation = (int)(var14 * 256.0D); // L: 56 + this.lightness = (int)(var16 * 256.0D); // L: 57 + if (this.saturation < 0) { // L: 58 + this.saturation = 0; + } else if (this.saturation > 255) { // L: 59 + this.saturation = 255; + } + + if (this.lightness < 0) { // L: 60 + this.lightness = 0; + } else if (this.lightness > 255) { // L: 61 + this.lightness = 255; + } + + if (var16 > 0.5D) { // L: 62 + this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); + } else { + this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 + } + + if (this.hueMultiplier < 1) { // L: 64 + this.hueMultiplier = 1; + } + + this.hue = (int)((double)this.hueMultiplier * var12); // L: 65 + } // L: 66 + + @ObfuscatedName("i") + public static final void method3190(long var0) { + if (var0 > 0L) { // L: 9 + if (var0 % 10L == 0L) { // L: 10 + AttackOption.method2308(var0 - 1L); // L: 11 + AttackOption.method2308(1L); // L: 12 + } else { + AttackOption.method2308(var0); // L: 14 + } + + } + } // L: 15 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 8d6be228ef..ffe0f05712 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,98 +2,98 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lt") +@ObfuscatedName("le") @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); - } + super(var1, var2, var3, var4, var5, var6, var7); // L: 7 + } // L: 8 public Font(byte[] var1) { - super(var1); - } + super(var1); // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; - int var8 = Rasterizer2D.Rasterizer2D_width - var4; - int var9 = 0; - int var10 = 0; + 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 var11; - 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 < 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 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 26 var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 < 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 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; - var4 -= 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 (var4 > 0 && var5 > 0) { - AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); + if (var4 > 0 && var5 > 0) { // L: 42 + AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); // L: 43 } - } + } // L: 44 - @ObfuscatedName("q") + @ObfuscatedName("w") @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; - int var9 = Rasterizer2D.Rasterizer2D_width - var4; - int var10 = 0; - int var11 = 0; + 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 var12; - 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 < 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 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 58 var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 < 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 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; - var4 -= 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 (var4 > 0 && var5 > 0) { - AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); + if (var4 > 0 && var5 > 0) { // L: 74 + AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); // L: 75 } - } + } // L: 76 } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index bcf7dd64f0..9eff2f08ec 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,254 +1,140 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("nx") +@ObfuscatedName("ny") @Implements("FontName") public class FontName { - @ObfuscatedName("l") + @ObfuscatedName("si") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Laa;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lny;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("t") + @ObfuscatedName("nb") + @ObfuscatedGetter( + intValue = -1205124413 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("e") @Export("name") String name; static { - 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_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_verdana15 = new FontName("verdana_15pt_regular"); // L: 12 } FontName(String var1) { - this.name = var1; - } + this.name = var1; // L: 16 + } // L: 17 - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1133097003" - ) - static int method6619(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var3 = HealthBarUpdate.getWidget(var4); - } else { - var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 5]; - class16.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - class16.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - class16.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - class16.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - Decimator.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var8 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - FillMode var6 = (FillMode)class128.findEnumerated(class125.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - class16.invalidateWidget(var3); - } - - return 1; + @ObfuscatedName("w") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 + if (0L == var0 % 37L) { // L: 32 + return null; } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - var3.field3081 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1128) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } else { - return 2; + int var2 = 0; // L: 33 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37 + ++var2; // L: 36 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 39 40 49 + long var6 = var0; // L: 41 + var0 /= 37L; // L: 42 + var8 = class320.base37Table[(int)(var6 - 37L * var0)]; // L: 43 + if (var8 == '_') { // L: 44 + int var9 = var5.length() - 1; // L: 45 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 46 + var8 = 160; // L: 47 + } + } + + var5.reverse(); // L: 51 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 52 + return var5.toString(); // L: 53 + } + } else { + return null; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([BIIII[Lfq;I)V", + garbageValue = "1067712640" + ) + static final void method6688(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 77 + for (var7 = 0; var7 < 64; ++var7) { // L: 78 + for (var8 = 0; var8 < 64; ++var8) { // L: 79 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 80 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var2 + var8] &= -16777217; + } } } } - } + + Buffer var10 = new Buffer(var0); // L: 84 + + for (var7 = 0; var7 < 4; ++var7) { // L: 85 + for (var8 = 0; var8 < 64; ++var8) { // L: 86 + for (int var9 = 0; var9 < 64; ++var9) { // L: 87 + GameEngine.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 88 + } + } + } + + } // L: 92 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 8f4c244810..0dcb54e2d8 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -3,92 +3,205 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("nd") +@ObfuscatedName("nu") @Implements("Fonts") public class Fonts { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;)V" + descriptor = "(Lko;Lko;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { - this.spritesArchive = var1; - this.fontsArchive = var2; - this.map = new HashMap(); - } + this.spritesArchive = var1; // L: 14 + this.fontsArchive = var2; // L: 15 + this.map = new HashMap(); // L: 16 + } // L: 17 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([Lnx;I)Ljava/util/HashMap;", - garbageValue = "-549116383" + descriptor = "([Lny;I)Ljava/util/HashMap;", + garbageValue = "-870343448" ) @Export("createMap") public HashMap createMap(FontName[] var1) { - HashMap var2 = new HashMap(); - FontName[] var3 = var1; + HashMap var2 = new HashMap(); // L: 20 + FontName[] var3 = var1; // L: 22 - for (int var4 = 0; var4 < var3.length; ++var4) { - FontName var5 = var3[var4]; - if (this.map.containsKey(var5)) { - var2.put(var5, this.map.get(var5)); + 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 } else { - AbstractArchive var7 = this.spritesArchive; - AbstractArchive var8 = this.fontsArchive; - String var9 = var5.name; - int var10 = var7.getGroupId(var9); - int var11 = var7.getFileId(var10, ""); - Font var6 = Actor.method2153(var7, var8, var10, var11); - if (var6 != null) { - this.map.put(var5, var6); - var2.put(var5, var6); + Font var6 = UserComparator1.method7234(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + if (var6 != null) { // L: 31 + this.map.put(var5, var6); // L: 32 + var2.put(var5, var6); // L: 33 } } } - return var2; + return var2; // L: 39 } - @ObfuscatedName("m") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "175544485" + descriptor = "(ILbp;ZB)I", + garbageValue = "31" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class316.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; + static int method6687(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2684 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2685 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2686 + return 1; // L: 2687 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2689 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2690 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2691 + return 1; // L: 2692 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2694 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2695 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2696 + return 1; // L: 2697 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2699 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2700 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2701 + return 1; // L: 2702 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2704 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2705 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2706 + return 1; // L: 2707 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2709 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2710 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2711 + return 1; // L: 2712 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2714 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2715 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2716 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2717 + return 1; // L: 2718 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2720 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2721 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2722 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2723 + return 1; // L: 2724 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2726 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2727 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2728 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2729 + return 1; // L: 2730 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2732 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2733 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2734 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2735 + return 1; // L: 2736 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2738 + var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2739 + if (JagexCache.grandExchangeEvents != null) { // L: 2740 + JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2741 } - var6 = var7; - } + return 1; // L: 2743 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2745 + var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2746 + if (JagexCache.grandExchangeEvents != null) { // L: 2747 + JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2748 + } - var3[var4++] = (char)var6; + return 1; // L: 2750 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2752 + class14.Interpreter_intStackSize -= 2; // L: 2753 + var12 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] == 1; // L: 2754 + boolean var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 2755 + if (JagexCache.grandExchangeEvents != null) { // L: 2756 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2757 + JagexCache.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2758 + } + + return 1; // L: 2760 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2762 + var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2763 + if (JagexCache.grandExchangeEvents != null) { // L: 2764 + JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2765 + } + + return 1; // L: 2767 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2769 + var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2770 + if (JagexCache.grandExchangeEvents != null) { // L: 2771 + JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2772 + } + + return 1; // L: 2774 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2776 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = JagexCache.grandExchangeEvents == null ? 0 : JagexCache.grandExchangeEvents.events.size(); // L: 2777 + return 1; // L: 2778 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2780 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2781 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2782 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.world; // L: 2783 + return 1; // L: 2784 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2786 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2787 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2788 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2789 + return 1; // L: 2790 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2792 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2793 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2794 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2795 + return 1; // L: 2796 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2798 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2799 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2800 + long var5 = class111.method2516() - GrandExchangeOfferUnitPriceComparator.field3758 - var4.age; // L: 2801 + int var7 = (int)(var5 / 3600000L); // L: 2802 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2803 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2804 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2805 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10; // L: 2806 + return 1; // L: 2807 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2809 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2810 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2811 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2812 + return 1; // L: 2813 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2815 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2816 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2817 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2818 + return 1; // L: 2819 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2821 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2822 + var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2823 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2824 + return 1; // L: 2825 + } else { + return 2; // L: 2827 + } + } } } - - return new String(var3, 0, var4); } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 7a22b5d0d2..4033e1064b 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,108 +1,84 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("ho") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lhj;" + descriptor = "Ljf;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("mx") + @ObfuscatedGetter( + intValue = -1716567897 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Lhe;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;IZ)V" + descriptor = "(Lko;Lko;IZ)V", + garbageValue = "0" ) - Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - NodeDeque var5 = new NodeDeque(); - int var6 = var1.getGroupFileCount(var3); - this.frames = new Animation[var6]; - int[] var7 = var1.getGroupFileIds(var3); + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + NodeDeque var5 = new NodeDeque(); // L: 11 + int var6 = var1.getGroupFileCount(var3); // L: 12 + this.frames = new Animation[var6]; // L: 13 + int[] var7 = var1.getGroupFileIds(var3); // L: 14 - for (int var8 = 0; var8 < var7.length; ++var8) { - byte[] var9 = var1.takeFile(var3, var7[var8]); - Skeleton var10 = null; - int var11 = (var9[0] & 255) << 8 | var9[1] & 255; + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15 + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16 + Skeleton var10 = null; // L: 17 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18 - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { - if (var11 == var12.id) { - var10 = var12; + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25 + if (var11 == var12.id) { // L: 21 + var10 = var12; // L: 22 break; } } - if (var10 == null) { - byte[] var13; - if (var4) { - var13 = var2.getFile(0, var11); - } else { - var13 = var2.getFile(var11, 0); - } - - var10 = new Skeleton(var11, var13); - var5.addFirst(var10); + 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 } - this.frames[var7[var8]] = new Animation(var9, var10); + this.frames[var7[var8]] = new Animation(var9, var10); // L: 34 } - } + } // L: 36 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "73" + descriptor = "(II)Z", + garbageValue = "1499014717" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; + return this.frames[var1].hasAlphaTransform; // L: 39 } - @ObfuscatedName("aa") + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "16711935" + descriptor = "(B)V", + garbageValue = "1" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (AccessFile.garbageCollector == null || !AccessFile.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - AccessFile.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (AccessFile.garbageCollector != null) { - long var9 = UserComparator4.method2406(); - long var3 = AccessFile.garbageCollector.getCollectionTime(); - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(var5 * 100L / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } + static void method4481() { + PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2745, Client.packetWriter.isaacCipher); // L: 4570 + var0.packetBuffer.writeByte(class134.getWindowedMode()); // L: 4571 + var0.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 4572 + var0.packetBuffer.writeShort(KeyHandler.canvasHeight); // L: 4573 + Client.packetWriter.addNode(var0); // L: 4574 + } // L: 4575 } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 2239d037a5..76032c23a0 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,74 +3,77 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lv") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("l") - boolean field3949; - @ObfuscatedName("q") - boolean field3948; + @ObfuscatedName("i") + boolean field3942; + @ObfuscatedName("w") + boolean field3941; Friend() { - } + } // L: 9 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llg;I)I", - garbageValue = "2007974516" + descriptor = "(Llv;I)I", + garbageValue = "-1418759266" ) @Export("compareToFriend") int compareToFriend(Friend var1) { - if (super.world == Client.worldId && Client.worldId != var1.world) { + if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12 return -1; - } else if (Client.worldId == var1.world && super.world != Client.worldId) { + } else if (Client.worldId == var1.world && super.world != Client.worldId) { // L: 13 return 1; - } else if (super.world != 0 && var1.world == 0) { + } else if (super.world != 0 && var1.world == 0) { // L: 14 return -1; - } else if (var1.world != 0 && super.world == 0) { + } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3949 && !var1.field3949) { + } else if (this.field3942 && !var1.field3942) { // L: 16 return -1; - } else if (!this.field3949 && var1.field3949) { + } else if (!this.field3942 && var1.field3942) { // L: 17 return 1; - } else if (this.field3948 && !var1.field3948) { + } else if (this.field3941 && !var1.field3941) { // L: 18 return -1; - } else if (!this.field3948 && var1.field3948) { + } else if (!this.field3941 && var1.field3941) { // L: 19 return 1; } else { - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Llu;B)I", - garbageValue = "-81" + descriptor = "(Lla;I)I", + garbageValue = "-1073614160" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareToFriend((Friend)var1); + return this.compareToFriend((Friend)var1); // L: 29 } public int compareTo(Object var1) { - return this.compareToFriend((Friend)var1); + return this.compareToFriend((Friend)var1); // L: 33 } - @ObfuscatedName("j") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "67" + descriptor = "(III)V", + garbageValue = "1293240706" ) - public static int method6003(int var0) { - return var0 >> 17 & 7; - } + static void method6057(int var0, int var1) { + if (class408.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 4098 + Archive var2 = AbstractWorldMapIcon.archive11; // L: 4099 + int var3 = class408.clientPreferences.musicVolume; // L: 4100 + class247.musicPlayerStatus = 1; // L: 4102 + class128.musicTrackArchive = var2; // L: 4103 + FillMode.musicTrackGroupId = var0; // L: 4104 + ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 4105 + class247.musicTrackVolume = var3; // L: 4106 + SecureRandomCallable.musicTrackBoolean = false; // L: 4107 + class247.pcmSampleLength = 10000; // L: 4108 + Client.field710 = true; // L: 4110 + } - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1839296655" - ) - static int method6004(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); - } + } // L: 4112 } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 99e6c9dd0b..e71adb78d7 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,30 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("lw") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 406159979 + intValue = 1837653609 ) - public int field3952; - @ObfuscatedName("q") + static int field3943; + @ObfuscatedName("gu") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lle;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1663283777 + ) + public int field3945; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lpb;" ) @Export("username") public Username username; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lpm;I)V" + descriptor = "(Lpb;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3952 = (int)(UserComparator4.method2406() / 1000L); - this.username = var1; - this.world = (short)var2; - } + this.field3945 = (int)(class111.method2516() / 1000L); // L: 107 + this.username = var1; // L: 108 + this.world = (short)var2; // L: 109 + } // L: 110 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-106" + ) + static void method6058() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.obj != null) { // L: 31 + var0.set(); + } + } + + } // L: 33 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 25c86906df..59dae5f66a 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,287 +1,380 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bm") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llg;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llr;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 60387583 + intValue = -991444483 ) - int field798; + int field765; @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lni;)V" ) FriendSystem(LoginType var1) { - this.field798 = 0; - this.loginType = var1; - this.friendsList = new FriendsList(var1); - this.ignoreList = new IgnoreList(var1); - } + this.field765 = 0; // L: 23 + this.loginType = var1; // L: 26 + this.friendsList = new FriendsList(var1); // L: 27 + this.ignoreList = new IgnoreList(var1); // L: 28 + } // L: 29 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "581100794" + garbageValue = "1885773213" ) - boolean method1650() { - return this.field798 == 2; + boolean method1757() { + return this.field765 == 2; // L: 32 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1858509524" + garbageValue = "1636767062" ) - final void method1651() { - this.field798 = 1; - } + final void method1746() { + this.field765 = 1; // L: 36 + } // L: 37 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "1685533221" + descriptor = "(Lop;IB)V", + garbageValue = "-3" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { - this.friendsList.read(var1, var2); - this.field798 = 2; - ItemLayer.method4020(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-21942" - ) - @Export("processFriendUpdates") - final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3952 < UserComparator4.method2406() / 1000L - 5L) { - if (var1.world > 0) { - GraphicsDefaults.addGameMessage(5, "", var1.username + " has logged in."); - } - - if (var1.world == 0) { - GraphicsDefaults.addGameMessage(5, "", var1.username + " has logged out."); - } - - var1.remove(); - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "454898237" - ) - @Export("clear") - final void clear() { - this.field798 = 0; - this.friendsList.clear(); - this.ignoreList.clear(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lpm;ZI)Z", - garbageValue = "832653527" - ) - @Export("isFriended") - final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { - return false; - } else if (var1.equals(class67.localPlayer.username)) { - return true; - } else { - return this.friendsList.isFriended(var1, var2); - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Z", - garbageValue = "1448245723" - ) - @Export("isIgnored") - final boolean isIgnored(Username var1) { - if (var1 == null) { - return false; - } else { - return this.ignoreList.contains(var1); - } - } + this.friendsList.read(var1, var2); // L: 40 + this.field765 = 2; // L: 41 + UserComparator8.method2462(); // L: 42 + } // L: 43 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1077227721" + descriptor = "(B)V", + garbageValue = "-41" ) - @Export("addFriend") - final void addFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.friendsListIsFull()) { - class196.method3881(); - } else if (class67.localPlayer.username.equals(var2)) { - MusicPatchNode.method4912(); - } else if (this.isFriended(var2, false)) { - FloorUnderlayDefinition.method3094(var1); - } else if (this.isIgnored(var2)) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - String var3 = var10000.append(" from your ignore list first").toString(); - GraphicsDefaults.addGameMessage(30, "", var3); - } else { - WorldMapSection0.method3824(var1); + @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.field3945 < class111.method2516() / 1000L - 5L) { // L: 47 + if (var1.world > 0) { + class397.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 } + + if (var1.world == 0) { // L: 49 + class397.addGameMessage(5, "", var1.username + " has logged out."); + } + + var1.remove(); // L: 50 } } - } + + } // L: 53 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-903439002" + ) + @Export("clear") + final void clear() { + this.field765 = 0; // L: 56 + this.friendsList.clear(); // L: 57 + this.ignoreList.clear(); // L: 58 + } // L: 59 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "676441464" + descriptor = "(Lpb;ZI)Z", + garbageValue = "-1394062445" ) - @Export("friendsListIsFull") - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field630 != 1; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "394314051" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.canAddIgnore()) { - class18.method282(); - } else { - StringBuilder var10000; - String var3; - if (class67.localPlayer.username.equals(var2)) { - var10000 = null; - var3 = "You can't add yourself to your own ignore list"; - GraphicsDefaults.addGameMessage(30, "", var3); - } else { - Object var10001; - if (this.isIgnored(var2)) { - var10000 = (new StringBuilder()).append(var1); - var10001 = null; - var3 = var10000.append(" is already on your ignore list").toString(); - GraphicsDefaults.addGameMessage(30, "", var3); - } else if (this.isFriended(var2, false)) { - var10000 = new StringBuilder(); - var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var3 = var10000.append(" from your friend list first").toString(); - GraphicsDefaults.addGameMessage(30, "", var3); - } else { - Actor.method2152(var1); - } - } - } - } + @Export("isFriended") + final boolean isFriended(Username var1, boolean var2) { + if (var1 == null) { // L: 62 + return false; + } else if (var1.equals(HealthBarDefinition.localPlayer.username)) { // L: 63 + return true; + } else { + return this.friendsList.isFriended(var1, var2); // L: 64 } } - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1564665727" + descriptor = "(Lpb;I)Z", + garbageValue = "624915849" ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field630 != 1; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1771954936" - ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.friendsList.removeByUsername(var2)) { - HealthBarDefinition.method2980(); - PacketBufferNode var3 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2687, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } - - ItemLayer.method4020(); - } + @Export("isIgnored") + final boolean isIgnored(Username var1) { + if (var1 == null) { // L: 69 + return false; + } else { + return this.ignoreList.contains(var1); // L: 70 } } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "43" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1752227266" ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.ignoreList.removeByUsername(var2)) { - HealthBarDefinition.method2980(); - PacketBufferNode var3 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2746, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var1)); + @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 + class20.method294(); // L: 79 + } else { + StringBuilder var10000; + String var4; + if (HealthBarDefinition.localPlayer.username.equals(var2)) { // L: 82 + var10000 = null; // L: 84 + var4 = "You can't add yourself to your own friend list"; + class397.addGameMessage(30, "", var4); // L: 86 + } else if (this.isFriended(var2, false)) { // L: 91 + var10000 = (new StringBuilder()).append(var1); // L: 93 + Object var10001 = null; + var4 = var10000.append(" is already on your friend list").toString(); + class397.addGameMessage(30, "", var4); // L: 95 + } else if (this.isIgnored(var2)) { // L: 100 + class279.method5217(var1); // L: 101 + } else { + PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2747, Client.packetWriter.isaacCipher); // L: 106 + var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1)); // L: 107 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 108 + Client.packetWriter.addNode(var3); // L: 109 + } + } + } + } + } // L: 80 89 98 102 111 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1476294097" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field588 != 1; // L: 128 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1282328040" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 135 + Username var2 = new Username(var1, this.loginType); // L: 136 + if (var2.hasCleanName()) { // L: 137 + StringBuilder var10000; + String var3; + if (this.canAddIgnore()) { // L: 138 + var10000 = null; // L: 140 + var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + class397.addGameMessage(30, "", var3); // L: 142 + } else if (HealthBarDefinition.localPlayer.username.equals(var2)) { // L: 147 + var10000 = null; // L: 149 + var3 = "You can't add yourself to your own ignore list"; + class397.addGameMessage(30, "", var3); // L: 151 + } else if (this.isIgnored(var2)) { // L: 156 + var10000 = (new StringBuilder()).append(var1); // L: 158 + Object var10001 = null; + var3 = var10000.append(" is already on your ignore list").toString(); + class397.addGameMessage(30, "", var3); // L: 160 + } else if (this.isFriended(var2, false)) { // L: 165 + KeyHandler.method324(var1); // L: 166 + } else { + class9.method82(var1); // L: 169 + } + } + } + } // L: 145 154 163 167 170 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-31" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field588 != 1; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "11" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 195 + Username var2 = new Username(var1, this.loginType); // L: 196 + if (var2.hasCleanName()) { // L: 197 + if (this.friendsList.removeByUsername(var2)) { + VarcInt.method3033(); + PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2684, Client.packetWriter.isaacCipher); // L: 201 + var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - SceneTilePaint.FriendSystem_invalidateIgnoreds(); + for (int var5 = 0; var5 < Players.Players_count; ++var5) { + Player var4 = Client.players[Players.Players_indices[var5]]; + var4.clearIsFriend(); + } + + Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 212 + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); + var7.clearIsFromFriend(); + } + + if (AbstractArchive.friendsChat != null) { // L: 219 + AbstractArchive.friendsChat.clearFriends(); // L: 220 + } + } } - } + } // L: 223 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpm;I)Z", - garbageValue = "2010486015" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "42" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { // L: 226 + Username var2 = new Username(var1, this.loginType); // L: 227 + if (var2.hasCleanName()) { // L: 228 + if (this.ignoreList.removeByUsername(var2)) { // L: 229 + VarcInt.method3033(); // L: 230 + PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2700, Client.packetWriter.isaacCipher); // L: 232 + var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1)); // L: 233 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 234 + Client.packetWriter.addNode(var3); // L: 235 + } + + TextureProvider.FriendSystem_invalidateIgnoreds(); // L: 237 + } + } + } // L: 238 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Z", + garbageValue = "1383012789" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); - return var2 != null && var2.hasWorld(); + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 250 + return var2 != null && var2.hasWorld(); // L: 251 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIIZIZB)V", + garbageValue = "87" + ) + @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 = WorldMapEvent.World_worlds[var6]; // L: 180 + WorldMapEvent.World_worlds[var6] = WorldMapEvent.World_worlds[var1]; // L: 181 + WorldMapEvent.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + World var11 = WorldMapEvent.World_worlds[var9]; // L: 185 + int var12 = WorldMapArchiveLoader.compareWorlds(var11, var8, var2, var3); // L: 187 + int var10; + if (var12 != 0) { // L: 188 + if (var3) { // L: 189 + var10 = -var12; // L: 190 + } else { + var10 = var12; // L: 194 + } + } else if (var4 == -1) { // L: 198 + var10 = 0; // L: 199 + } else { + int var13 = WorldMapArchiveLoader.compareWorlds(var11, var8, var4, var5); // L: 202 + if (var5) { // L: 203 + var10 = -var13; + } else { + var10 = var13; // L: 204 + } + } + + if (var10 <= 0) { // L: 206 + World var14 = WorldMapEvent.World_worlds[var9]; // L: 207 + WorldMapEvent.World_worlds[var9] = WorldMapEvent.World_worlds[var7]; // L: 208 + WorldMapEvent.World_worlds[var7++] = var14; // L: 209 + } + } + + WorldMapEvent.World_worlds[var1] = WorldMapEvent.World_worlds[var7]; // L: 213 + WorldMapEvent.World_worlds[var7] = var8; // L: 214 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216 + } + + } // L: 218 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1917272702" + ) + public static void method1755(boolean var0) { + if (var0 != BuddyRankComparator.ItemDefinition_inMembersWorld) { // L: 554 + CollisionMap.method3492(); // L: 555 + BuddyRankComparator.ItemDefinition_inMembersWorld = var0; // L: 556 + } + + } // L: 558 + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-725135495" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + KeyHandler.method343(); // L: 8059 + Client.menuActions[0] = "Cancel"; // L: 8060 + Client.menuTargets[0] = ""; // L: 8061 + Client.menuOpcodes[0] = 1006; // L: 8062 + Client.menuShiftClick[0] = false; // L: 8063 + Client.menuOptionsCount = 1; // L: 8064 + } // L: 8065 } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index de82f32292..9eaa8c564a 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -7,482 +7,223 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lz") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llc;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("name") public String name; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("owner") public String owner; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("minKick") public byte minKick; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1806063027 + intValue = 1093956825 ) @Export("rank") public int rank; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -432444385 + intValue = -724455409 ) int field3939; @ObfuscatedSignature( - descriptor = "(Lny;Lld;)V" + descriptor = "(Lni;Llc;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { - super(100); - this.name = null; - this.owner = null; - this.field3939 = 1; - this.loginType = var1; - this.localUser = var2; - } + super(100); // L: 19 + this.name = null; // L: 12 + this.owner = null; // L: 13 + this.field3939 = 1; // L: 16 + this.loginType = var1; // L: 20 + this.localUser = var2; // L: 21 + } // L: 22 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Llu;", - garbageValue = "396333118" + descriptor = "(I)Lla;", + garbageValue = "-450730044" ) @Export("newInstance") User newInstance() { - return new ClanMate(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)[Llu;", - garbageValue = "1129798936" - ) - @Export("newTypedArray") - User[] newTypedArray(int var1) { - return new ClanMate[var1]; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "711201950" - ) - @Export("readName") - final void readName(String var1) { - long var5 = 0L; - int var7 = var1.length(); - - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } - - String var10 = FloorDecoration.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; - } - - this.name = var10; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1349944727" - ) - @Export("setOwner") - final void setOwner(String var1) { - long var5 = 0L; - int var7 = var1.length(); - - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (var5 % 37L == 0L && 0L != var5) { - var5 /= 37L; - } - - String var10 = FloorDecoration.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; - } - - this.owner = var10; + return new ClanMate(); // L: 25 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "-11" + descriptor = "(IB)[Lla;", + garbageValue = "91" ) - @Export("readUpdate") - public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); - long var2 = var1.readLong(); - long var5 = var2; - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { - if (0L == var2 % 37L) { - var4 = null; - } else { - var7 = 0; - - for (long var8 = var2; var8 != 0L; var8 /= 37L) { - ++var7; - } - - StringBuilder var10 = new StringBuilder(var7); - - while (var5 != 0L) { - long var11 = var5; - var5 /= 37L; - var10.append(class320.base37Table[(int)(var11 - 37L * var5)]); - } - - var4 = var10.reverse().toString(); - } - } else { - var4 = null; - } - - this.readName(var4); - this.minKick = var1.readByte(); - var7 = var1.readUnsignedByte(); - if (var7 != 255) { - this.clear(); - - for (int var13 = 0; var13 < var7; ++var13) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var14 = var1.readUnsignedShort(); - var9.set(var14, ++this.field3939 - 1); - var9.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var9); - } - - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "1745125855" - ) - public final void method5971(Buffer var1) { - 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) { - if (this.getSize() == 0) { - return; - } - - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 != null && var6.getWorld() == var3) { - this.remove(var6); - } - } else { - var1.readStringCp1252NullTerminated(); - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 == null) { - if (this.getSize() > super.capacity) { - return; - } - - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); - } - - var6.set(var3, ++this.field3939 - 1); - var6.rank = var4; - this.isLocalPlayer(var6); - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1003784885" - ) - @Export("clearFriends") - public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { - ((ClanMate)this.get(var1)).clearIsFriend(); - } - + @Export("newTypedArray") + User[] newTypedArray(int var1) { + return new ClanMate[var1]; // L: 29 } @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-763520850" + ) + @Export("readName") + final void readName(String var1) { + this.name = class134.method2788(var1); // L: 33 + } // L: 34 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1960344003" + ) + @Export("setOwner") + final void setOwner(String var1) { + this.owner = class134.method2788(var1); // L: 37 + } // L: 38 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "248840752" + ) + @Export("readUpdate") + public final void readUpdate(Buffer var1) { + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 41 + long var2 = var1.readLong(); // L: 42 + long var5 = var2; // L: 44 + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { // L: 46 + if (0L == var2 % 37L) { // L: 50 + var4 = null; // L: 51 + } else { + var7 = 0; // L: 54 + + for (long var8 = var2; 0L != var8; var8 /= 37L) { // L: 55 56 58 + ++var7; // L: 57 + } + + StringBuilder var10 = new StringBuilder(var7); // L: 60 + + while (var5 != 0L) { // L: 61 + long var11 = var5; // L: 62 + var5 /= 37L; // L: 63 + var10.append(class320.base37Table[(int)(var11 - var5 * 37L)]); // L: 64 + } + + var4 = var10.reverse().toString(); // L: 66 + } + } else { + var4 = null; // L: 47 + } + + this.readName(var4); // L: 68 + this.minKick = var1.readByte(); // L: 69 + var7 = var1.readUnsignedByte(); // L: 70 + if (var7 != 255) { // L: 71 + this.clear(); // L: 72 + + for (int var13 = 0; var13 < var7; ++var13) { // L: 73 + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 74 + int var14 = var1.readUnsignedShort(); // L: 75 + var9.set(var14, ++this.field3939 - 1); // L: 76 + var9.rank = var1.readByte(); // L: 77 + var1.readStringCp1252NullTerminated(); // L: 78 + this.isLocalPlayer(var9); // L: 79 + } + + } + } // L: 81 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "65280" + ) + public final void method6040(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 84 + int var3 = var1.readUnsignedShort(); // L: 85 + byte var4 = var1.readByte(); // L: 86 + boolean var5 = false; // L: 87 + if (var4 == -128) { // L: 88 + var5 = true; + } + + ClanMate var6; + if (var5) { // L: 89 + if (this.getSize() == 0) { // L: 90 + return; + } + + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 91 + if (var6 != null && var6.getWorld() == var3) { // L: 92 + this.remove(var6); // L: 93 + } + } else { + var1.readStringCp1252NullTerminated(); // L: 97 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 98 + if (var6 == null) { // L: 99 + if (this.getSize() > super.capacity) { // L: 100 + return; + } + + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 101 + } + + var6.set(var3, ++this.field3939 - 1); // L: 103 + var6.rank = var4; // L: 104 + this.isLocalPlayer(var6); // L: 105 + } + + } // L: 107 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "98" + ) + @Export("clearFriends") + public final void clearFriends() { + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 110 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 111 + } + + } // L: 113 + + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1785573756" + garbageValue = "-12509743" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { - ((ClanMate)this.get(var1)).clearIsIgnored(); + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 116 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 117 } - } + } // L: 119 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Llj;I)V", - garbageValue = "-1946811966" + descriptor = "(Llp;I)V", + garbageValue = "609728257" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { + if (var1.getUsername().equals(this.localUser.username())) { // L: 122 this.rank = var1.rank; } - } - - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "21" - ) - static final void method5993() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == VertexNormal.Client_plane && Client.cycle <= var0.cycleEnd) { - if (Client.cycle >= var0.cycleStart) { - if (var0.targetIndex > 0) { - NPC var1 = Client.npcs[var0.targetIndex - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.setDestination(var1.x, var1.y, MidiPcmStream.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { - int var2 = -var0.targetIndex - 1; - Player var3; - if (var2 == Client.localPlayerIndex) { - var3 = class67.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, MidiPcmStream.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field536); - PlayerComposition.scene.drawEntity(VertexNormal.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(Ljt;II)I", - garbageValue = "-1200106583" - ) - static final int method5992(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = HealthBarUpdate.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class87.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = class67.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = HealthBarUpdate.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!class87.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = Varcs.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX; - } - - if (var6 == 19) { - var7 = (class67.localPlayer.y >> 7) + PlayerComposition.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } - } - } catch (Exception var14) { - return -1; - } - } else { - return -2; - } - } + } // L: 123 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 3d26daefc3..6020f5c643 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,167 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lg") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1046652711 + intValue = -1344623889 ) - int field3936; - @ObfuscatedName("m") + int field3929; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lky;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lni;)V" ) public FriendsList(LoginType var1) { - super(400); - this.field3936 = 1; - this.friendLoginUpdates = new LinkDeque(); - this.loginType = var1; - } + super(400); // L: 18 + this.field3929 = 1; // L: 14 + this.friendLoginUpdates = new LinkDeque(); // L: 15 + this.loginType = var1; // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Llu;", - garbageValue = "396333118" + descriptor = "(I)Lla;", + garbageValue = "-450730044" ) @Export("newInstance") User newInstance() { - return new Friend(); + return new Friend(); // L: 23 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)[Llu;", - garbageValue = "1129798936" + descriptor = "(IB)[Lla;", + garbageValue = "91" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; + return new Friend[var1]; // L: 27 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpm;ZI)Z", - garbageValue = "1386135004" + descriptor = "(Lpb;ZI)Z", + garbageValue = "-294857324" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); + Friend var3 = (Friend)this.getByUsername(var1); // L: 31 if (var3 == null) { - return false; + return false; // L: 32 } else { - return !var2 || var3.world != 0; + return !var2 || var3.world != 0; // L: 33 } } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "743763040" + descriptor = "(Lop;II)V", + garbageValue = "563373210" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { - boolean var3 = var1.readUnsignedByte() == 1; - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.readUnsignedByte(); - boolean var9 = (var8 & 2) != 0; - boolean var10 = (var8 & 1) != 0; - if (var6 > 0) { - var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - var1.readInt(); + if (var1.offset < var2) { // L: 38 + boolean var3 = var1.readUnsignedByte() == 1; // L: 39 + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 41 + int var6 = var1.readUnsignedShort(); // L: 42 + int var7 = var1.readUnsignedByte(); // L: 43 + int var8 = var1.readUnsignedByte(); // L: 44 + boolean var9 = (var8 & 2) != 0; // L: 45 + boolean var10 = (var8 & 1) != 0; // L: 46 + if (var6 > 0) { // L: 47 + var1.readStringCp1252NullTerminated(); // L: 48 + var1.readUnsignedByte(); // L: 49 + var1.readInt(); // L: 50 } - var1.readStringCp1252NullTerminated(); - if (var4 != null && var4.hasCleanName()) { - Friend var11 = (Friend)this.getByCurrentUsername(var4); - if (var3) { - Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var12 != var11) { - if (var11 != null) { - this.remove(var12); + var1.readStringCp1252NullTerminated(); // L: 52 + if (var4 != null && var4.hasCleanName()) { // L: 53 + Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 54 + if (var3) { // L: 55 + Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 56 + if (var12 != null && var12 != var11) { // L: 57 + if (var11 != null) { // L: 58 + this.remove(var12); // L: 59 } else { - var11 = var12; + var11 = var12; // L: 62 } } } - if (var11 != null) { - this.changeName(var11, var4, var5); - if (var6 != var11.world) { - boolean var14 = true; + if (var11 != null) { // L: 66 + this.changeName(var11, var4, var5); // L: 67 + if (var6 != var11.world) { // L: 68 + boolean var14 = true; // L: 69 - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { - if (var13.username.equals(var4)) { - if (var6 != 0 && var13.world == 0) { - var13.remove(); - var14 = false; - } else if (var6 == 0 && var13.world != 0) { - var13.remove(); - var14 = false; + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 70 + if (var13.username.equals(var4)) { // L: 71 + if (var6 != 0 && var13.world == 0) { // L: 72 + var13.remove(); // L: 73 + var14 = false; // L: 74 + } else if (var6 == 0 && var13.world != 0) { // L: 76 + var13.remove(); // L: 77 + var14 = false; // L: 78 } } } - if (var14) { + if (var14) { // L: 82 this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { + if (this.getSize() >= 400) { // L: 85 continue; } - var11 = (Friend)this.addLast(var4, var5); + var11 = (Friend)this.addLast(var4, var5); // L: 86 } - if (var6 != var11.world) { - var11.int2 = ++this.field3936 - 1; - if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -780817315) * 245467125; + if (var6 != var11.world) { // L: 89 + var11.int2 = ++this.field3929 - 1; // L: 90 + if (var11.world == -1 && var6 == 0) { // L: 91 + var11.int2 = -(var11.int2 * -939883657) * -641382841; } - var11.world = var6; + var11.world = var6; // L: 92 } - var11.rank = var7; - var11.field3949 = var9; - var11.field3948 = var10; - continue; + var11.rank = var7; // L: 94 + var11.field3942 = var9; // L: 95 + var11.field3941 = var10; // L: 96 + continue; // L: 97 } throw new IllegalStateException(); } - this.sort(); - return; + this.sort(); // L: 98 + return; // L: 99 } } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;B)V", - garbageValue = "28" - ) - public static void method5954(AbstractArchive var0) { - EnumComposition.EnumDefinition_archive = var0; - } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 98544c86cf..db46a44ce8 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,64 +1,50 @@ -import java.applet.Applet; import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +@ObfuscatedName("pd") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { - } + } // L: 13 - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;[BI)V", - garbageValue = "537396446" + descriptor = "(Lop;[BB)V", + garbageValue = "-63" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { - if (this.inflater == null) { + if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 + if (this.inflater == null) { // L: 17 this.inflater = new Inflater(true); } try { - 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.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.reset(); + this.inflater.reset(); // L: 26 } else { throw new RuntimeException(""); } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "-111" - ) - public static void method7450(Applet var0, String var1) { - class29.field168 = var0; - if (var1 != null) { - class29.field165 = var1; - } - - } + } // L: 27 } diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 5d279b2daf..ca26e09f72 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,123 +1,423 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jk") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljk;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljk;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljk;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljk;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("m") + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "Lhf;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("o") @Export("name") public final String name; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -425268361 + intValue = -1492187841 ) @Export("buildId") final int buildId; static { - LIVE = new GameBuild("LIVE", 0); - BUILDLIVE = new GameBuild("BUILDLIVE", 3); - RC = new GameBuild("RC", 1); - WIP = new GameBuild("WIP", 2); + 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 } GameBuild(String var1, int var2) { - this.name = var1; - this.buildId = var2; - } + this.name = var1; // L: 17 + this.buildId = var2; // L: 18 + } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-567425228" + descriptor = "(Loj;II)V", + garbageValue = "-1245191259" ) - static String method5123(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; - } else { - var1 = ""; - } + @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 - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; + int var4; + int var6; + byte[] var10000; + int var19; + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 + var19 = Players.Players_indices[var4]; // L: 77 + if ((Players.field1244[var19] & 1) == 0) { // L: 78 + if (var3 > 0) { // L: 79 + --var3; // L: 80 + var10000 = Players.field1244; // L: 81 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); // L: 84 + if (var6 == 0) { // L: 85 + var3 = DynamicObject.method1998(var0); // L: 86 + var10000 = Players.field1244; // L: 87 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + Projectile.readPlayerUpdate(var0, var19); // L: 90 } - - var7 = var7.substring(0, var8); } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; } } - } - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "1740184518" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - StructComposition.insertMenuItem(var0, var1, var2, var3, var4, var5, false); - } + var0.exportIndex(); // L: 93 + if (var3 != 0) { // L: 94 + throw new RuntimeException(); // L: 95 + } else { + var0.importIndex(); // L: 97 + + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 + var19 = Players.Players_indices[var4]; // L: 99 + if ((Players.field1244[var19] & 1) != 0) { // L: 100 + if (var3 > 0) { // L: 101 + --var3; // L: 102 + var10000 = Players.field1244; // L: 103 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); // L: 106 + if (var6 == 0) { // L: 107 + var3 = DynamicObject.method1998(var0); // L: 108 + var10000 = Players.field1244; // L: 109 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + Projectile.readPlayerUpdate(var0, var19); // L: 112 + } + } + } + } + + var0.exportIndex(); // L: 115 + if (var3 != 0) { // L: 116 + throw new RuntimeException(); // L: 117 + } else { + var0.importIndex(); // L: 119 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 + var19 = Players.Players_emptyIndices[var4]; // L: 121 + if ((Players.field1244[var19] & 1) != 0) { // L: 122 + if (var3 > 0) { // L: 123 + --var3; // L: 124 + var10000 = Players.field1244; // L: 125 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); // L: 128 + if (var6 == 0) { // L: 129 + var3 = DynamicObject.method1998(var0); // L: 130 + var10000 = Players.field1244; // L: 131 + var10000[var19] = (byte)(var10000[var19] | 2); + } else if (WorldMapData_0.updateExternalPlayer(var0, var19)) { // L: 134 + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } + } + } + } + + var0.exportIndex(); // L: 137 + if (var3 != 0) { // L: 138 + throw new RuntimeException(); // L: 139 + } else { + var0.importIndex(); // L: 141 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 + var19 = Players.Players_emptyIndices[var4]; // L: 143 + if ((Players.field1244[var19] & 1) == 0) { // L: 144 + if (var3 > 0) { // L: 145 + --var3; // L: 146 + var10000 = Players.field1244; // L: 147 + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); // L: 150 + if (var6 == 0) { // L: 151 + var3 = DynamicObject.method1998(var0); // L: 152 + var10000 = Players.field1244; // L: 153 + var10000[var19] = (byte)(var10000[var19] | 2); + } else if (WorldMapData_0.updateExternalPlayer(var0, var19)) { // L: 156 + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } + } + } + } + + var0.exportIndex(); // L: 159 + if (var3 != 0) { // L: 160 + throw new RuntimeException(); // L: 161 + } else { + Players.Players_count = 0; // L: 163 + Players.Players_emptyIdxCount = 0; // L: 164 + + Player var5; + for (var4 = 1; var4 < 2048; ++var4) { // L: 165 + var10000 = Players.field1244; // L: 166 + var10000[var4] = (byte)(var10000[var4] >> 1); + var5 = Client.players[var4]; // L: 167 + if (var5 != null) { // L: 168 + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 + } + } + + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173 + var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174 + var5 = Client.players[var4]; // L: 175 + var6 = var0.readUnsignedByte(); // L: 176 + if ((var6 & 128) != 0) { // L: 177 + var6 += var0.readUnsignedByte() << 8; + } + + byte var7 = -1; // L: 179 + if ((var6 & 4) != 0) { // L: 180 + var5.targetIndex = var0.method7120(); // L: 181 + if (var5.targetIndex == 65535) { // L: 182 + var5.targetIndex = -1; + } + } + + if ((var6 & 32) != 0) { // L: 184 + var5.field1112 = var0.method7120(); // L: 185 + if (var5.pathLength == 0) { // L: 186 + var5.orientation = var5.field1112; // L: 187 + var5.field1112 = -1; // L: 188 + } + } + + int var8; + int var11; + int var12; + int var15; + if ((var6 & 16) != 0) { // L: 191 + var8 = var0.method7120(); // L: 192 + PlayerType var9 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var0.method6996()); // L: 193 + boolean var10 = var0.readUnsignedByte() == 1; // L: 194 + var11 = var0.readUnsignedByte(); // L: 195 + var12 = var0.offset; // L: 196 + if (var5.username != null && var5.appearance != null) { // L: 197 + boolean var13 = false; // L: 198 + if (var9.isUser && class112.friendSystem.isIgnored(var5.username)) { // L: 199 200 + var13 = true; + } + + if (!var13 && Client.field539 == 0 && !var5.isHidden) { // L: 202 + Players.field1240.offset = 0; // L: 203 + var0.method7017(Players.field1240.array, 0, var11); // L: 204 + Players.field1240.offset = 0; // L: 205 + String var14 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(Players.field1240))); // L: 206 + var5.overheadText = var14.trim(); // L: 207 + var5.overheadTextColor = var8 >> 8; // L: 208 + var5.overheadTextEffect = var8 & 255; // L: 209 + var5.overheadTextCyclesRemaining = 150; // L: 210 + var5.isAutoChatting = var10; // L: 211 + var5.field1099 = var5 != HealthBarDefinition.localPlayer && var9.isUser && "" != Client.field692 && var14.toLowerCase().indexOf(Client.field692) == -1; // L: 212 + if (var9.isPrivileged) { // L: 214 + var15 = var10 ? 91 : 1; + } else { + var15 = var10 ? 90 : 2; // L: 215 + } + + if (var9.modIcon != -1) { // L: 216 + class397.addGameMessage(var15, SpriteMask.method4998(var9.modIcon) + var5.username.getName(), var14); + } else { + class397.addGameMessage(var15, var5.username.getName(), var14); // L: 217 + } + } + } + + var0.offset = var11 + var12; // L: 220 + } + + if ((var6 & 64) != 0) { // L: 222 + var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 223 + if (var5.overheadText.charAt(0) == '~') { // L: 224 + var5.overheadText = var5.overheadText.substring(1); // L: 225 + class397.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 226 + } else if (var5 == HealthBarDefinition.localPlayer) { // L: 228 + class397.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 229 + } + + var5.isAutoChatting = false; // L: 231 + var5.overheadTextColor = 0; // L: 232 + var5.overheadTextEffect = 0; // L: 233 + var5.overheadTextCyclesRemaining = 150; // L: 234 + } + + if ((var6 & 1) != 0) { // L: 236 + var8 = var0.readUnsignedByte(); // L: 237 + byte[] var20 = new byte[var8]; // L: 238 + Buffer var16 = new Buffer(var20); // L: 239 + var0.method7131(var20, 0, var8); // L: 240 + Players.field1242[var4] = var16; // L: 241 + var5.read(var16); // L: 242 + } + + if ((var6 & 1024) != 0) { // L: 244 + for (var8 = 0; var8 < 3; ++var8) { // L: 245 + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + int var17; + if ((var6 & 8) != 0) { // L: 247 + var8 = var0.method7120(); // L: 248 + if (var8 == 65535) { // L: 249 + var8 = -1; + } + + var17 = var0.method6996(); // L: 250 + FaceNormal.performPlayerAnimation(var5, var8, var17); // L: 251 + } + + if ((var6 & 512) != 0) { // L: 253 + var5.field1083 = var0.method6973(); // L: 254 + var5.field1100 = var0.readByte(); // L: 255 + var5.field1128 = var0.readByte(); // L: 256 + var5.field1130 = var0.readByte(); // L: 257 + var5.field1131 = var0.method7004() + Client.cycle; // L: 258 + var5.field1132 = var0.method7120() + Client.cycle; // L: 259 + var5.field1133 = var0.readUnsignedShort(); // L: 260 + if (var5.field1067) { // L: 261 + var5.field1083 += var5.tileX; // L: 262 + var5.field1100 += var5.tileY; // L: 263 + var5.field1128 += var5.tileX; // L: 264 + var5.field1130 += var5.tileY; // L: 265 + var5.pathLength = 0; // L: 266 + } else { + var5.field1083 += var5.pathX[0]; // L: 269 + var5.field1100 += var5.pathY[0]; // L: 270 + var5.field1128 += var5.pathX[0]; // L: 271 + var5.field1130 += var5.pathY[0]; // L: 272 + var5.pathLength = 1; // L: 273 + } + + var5.field1144 = 0; // L: 275 + } + + if ((var6 & 4096) != 0) { // L: 277 + var7 = var0.method6999(); // L: 278 + } + + if ((var6 & 256) != 0) { // L: 280 + var5.spotAnimation = var0.method7004(); // L: 281 + var8 = var0.readInt(); // L: 282 + var5.field1126 = var8 >> 16; // L: 283 + var5.field1125 = (var8 & 65535) + Client.cycle; // L: 284 + var5.spotAnimationFrame = 0; // L: 285 + var5.spotAnimationFrameCycle = 0; // L: 286 + if (var5.field1125 > Client.cycle) { // L: 287 + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { // L: 288 + var5.spotAnimation = -1; + } + } + + if ((var6 & 2048) != 0) { // L: 290 + Players.field1241[var4] = var0.method6999(); // L: 291 + } + + if ((var6 & 2) != 0) { // L: 293 + var8 = var0.method6997(); // L: 294 + int var18; + int var21; + int var23; + if (var8 > 0) { // L: 295 + for (var17 = 0; var17 < var8; ++var17) { // L: 296 + var11 = -1; // L: 298 + var12 = -1; // L: 299 + var23 = -1; // L: 300 + var21 = var0.readUShortSmart(); // L: 301 + if (var21 == 32767) { // L: 302 + var21 = var0.readUShortSmart(); // L: 303 + var12 = var0.readUShortSmart(); // L: 304 + var11 = var0.readUShortSmart(); // L: 305 + var23 = var0.readUShortSmart(); // L: 306 + } else if (var21 != 32766) { // L: 308 + var12 = var0.readUShortSmart(); // L: 309 + } else { + var21 = -1; // L: 311 + } + + var18 = var0.readUShortSmart(); // L: 312 + var5.addHitSplat(var21, var12, var11, var23, Client.cycle, var18); // L: 313 + } + } + + var17 = var0.method6995(); // L: 316 + if (var17 > 0) { // L: 317 + for (var21 = 0; var21 < var17; ++var21) { // L: 318 + var11 = var0.readUShortSmart(); // L: 319 + var12 = var0.readUShortSmart(); // L: 320 + if (var12 != 32767) { // L: 321 + var23 = var0.readUShortSmart(); // L: 322 + var18 = var0.method6997(); // L: 323 + var15 = var12 > 0 ? var0.method6997() : var18; // L: 324 + var5.addHealthBar(var11, Client.cycle, var12, var23, var18, var15); // L: 325 + } else { + var5.removeHealthBar(var11); // L: 327 + } + } + } + } + + if (var5.field1067) { // L: 331 + if (var7 == 127) { // L: 332 + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var22; + if (var7 != -1) { // L: 335 + var22 = var7; + } else { + var22 = Players.field1241[var4]; // L: 336 + } + + var5.method2109(var5.tileX, var5.tileY, var22); // L: 337 + } + } + } + + if (var0.offset - var2 != var1) { // L: 344 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 345 + } + } + } + } + } + } // L: 347 } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index 9190d524f7..84f1d3641e 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -2,7 +2,6 @@ import java.applet.Applet; import java.awt.Color; import java.awt.Container; import java.awt.EventQueue; -import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; import java.awt.Insets; @@ -25,176 +24,173 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("ai") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lew;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Lai;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 997222287 + intValue = -858712261 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 5452737720301901037L + longValue = -5031362625863510515L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1021542923 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 115124095 + intValue = 617104153 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1771635901 + intValue = 2102456181 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1720266437 + intValue = 390027783 ) @Export("fps") protected static int fps; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 261633385 - ) - static int field189; - @ObfuscatedName("b") + @ObfuscatedName("z") @Export("clientTickTimes") protected static long[] clientTickTimes; - @ObfuscatedName("ah") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("aa") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1523559739 + intValue = 688008119 ) - static int field200; + static int field178; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1856914925 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 942844513 + ) + static int field191; @ObfuscatedName("ap") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = -6264958768936891363L + longValue = 4237137078128785361L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - longValue = 2125926651661480101L + longValue = 2056276932530273441L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("kd") + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "[Loe;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("k") + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("e") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -712859225 + intValue = 32100603 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -967675265 + intValue = -160724727 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -741575651 + intValue = -827932873 ) @Export("canvasX") int canvasX; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1158546781 + intValue = -1933012565 ) @Export("canvasY") int canvasY; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 583786985 + intValue = 1123175499 ) - int field179; - @ObfuscatedName("ab") + int field184; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1417825827 + intValue = 2060371379 ) - int field193; - @ObfuscatedName("ad") + int field185; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1730708465 + intValue = 1530282643 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -322414797 + intValue = -628736541 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("frame") Frame frame; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - longValue = 6172438691100776965L + longValue = 578203363854775073L ) - volatile long field203; - @ObfuscatedName("ax") + volatile long field195; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lc;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("an") + @ObfuscatedName("ax") @Export("clipboard") Clipboard clipboard; @ObfuscatedName("av") @@ -203,168 +199,174 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen static { gameEngine = null; - GameEngine_redundantStartThreadCount = 0; + GameEngine_redundantStartThreadCount = 0; // L: 43 stopTimeMs = 0L; isKilled = false; cycleDurationMillis = 20; fiveOrOne = 1; - fps = 0; + fps = 0; // L: 50 graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field200 = 500; - volatileFocus = true; - garbageCollectorLastCollectionTime = -1L; - garbageCollectorLastCheckTimeMs = -1L; + field191 = 500; // L: 73 + volatileFocus = true; // L: 82 + garbageCollectorLastCollectionTime = -1L; // L: 85 + garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { - this.hasErrored = false; - this.canvasX = 0; - this.canvasY = 0; - this.fullRedraw = true; + this.hasErrored = false; // L: 46 + this.canvasX = 0; // L: 59 + this.canvasY = 0; // L: 60 + this.fullRedraw = true; // L: 71 this.resizeCanvasNextFrame = false; - this.isCanvasInvalid = false; - this.field203 = 0L; + this.isCanvasInvalid = false; // L: 75 + this.field195 = 0L; // L: 76 EventQueue var1 = null; try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); - } catch (Throwable var3) { + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 + } catch (Throwable var3) { // L: 93 } - this.eventQueue = var1; + this.eventQueue = var1; // L: 94 DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); - GraphicsObject.pcmPlayerProvider = var2; - } + ItemContainer.pcmPlayerProvider = var2; // L: 97 + } // L: 99 - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "-608909834" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method462(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 + this.method533(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; - } + } // L: 105 - @ObfuscatedName("t") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-1628524412" + garbageValue = "-2098346454" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - class121.method2542(1L); + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 + FloorUnderlayDefinition.method3190(1L); } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 } } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Lec;", - garbageValue = "-1260959118" - ) - @Export("mouseWheel") - protected class144 mouseWheel() { - if (this.mouseWheelHandler == null) { - this.mouseWheelHandler = new MouseWheelHandler(); - this.mouseWheelHandler.addTo(this.canvas); - } - - return this.mouseWheelHandler; - } + } // L: 111 @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)Leg;", + garbageValue = "97" + ) + @Export("mouseWheel") + protected class144 mouseWheel() { + if (this.mouseWheelHandler == null) { // L: 114 + this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 + this.mouseWheelHandler.addTo(this.canvas); + } + + return this.mouseWheelHandler; // L: 118 + } + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1813234694" + garbageValue = "-999701566" ) @Export("setUpClipboard") protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); - } + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 + } // L: 123 - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "8" + garbageValue = "-1" ) - protected void method450(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); - } + protected void method484(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 + } // L: 127 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-79671387" + garbageValue = "-99443969" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - KeyHandler.KeyHandler_keyCodes[186] = 57; - KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 132 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 133 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[189] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 138 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 139 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 140 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 141 KeyHandler.KeyHandler_keyCodes[222] = 59; KeyHandler.KeyHandler_keyCodes[223] = 28; } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; - KeyHandler.KeyHandler_keyCodes[45] = 26; - KeyHandler.KeyHandler_keyCodes[46] = 72; - KeyHandler.KeyHandler_keyCodes[47] = 73; - KeyHandler.KeyHandler_keyCodes[59] = 57; - KeyHandler.KeyHandler_keyCodes[61] = 27; - KeyHandler.KeyHandler_keyCodes[91] = 42; - KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 146 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 147 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 148 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 149 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 150 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 151 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 152 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 153 KeyHandler.KeyHandler_keyCodes[93] = 43; KeyHandler.KeyHandler_keyCodes[192] = 28; - KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 156 KeyHandler.KeyHandler_keyCodes[520] = 59; } - class12.method157(this.canvas); + java.awt.Canvas var1 = this.canvas; // L: 160 + var1.setFocusTraversalKeysEnabled(false); + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); } - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1100115563" + garbageValue = "1124509937" ) - protected final void method452() { - class131.method2690(this.canvas); + protected final void method440() { + java.awt.Canvas var1 = this.canvas; // L: 169 + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 172 + var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-494856599" + descriptor = "(B)V", + garbageValue = "-86" ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); + Container var1 = this.container(); // L: 178 if (var1 != null) { - Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field179); - this.contentHeight = Math.max(var2.highY, this.field193); - if (this.contentWidth <= 0) { + Bounds var2 = this.getFrameContentBounds(); // L: 180 + this.contentWidth = Math.max(var2.highX, this.field184); + this.contentHeight = Math.max(var2.highY, this.field185); // L: 182 + if (this.contentWidth <= 0) { // L: 183 this.contentWidth = 1; } @@ -372,215 +374,217 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.contentHeight = 1; } - Huffman.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - MouseRecorder.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - Huffman.canvasWidth) / 2; + canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + KeyHandler.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(Huffman.canvasWidth, MouseRecorder.canvasHeight); - class244.rasterProvider = new RasterProvider(Huffman.canvasWidth, MouseRecorder.canvasHeight, this.canvas); + this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 189 + Canvas.rasterProvider = new RasterProvider(canvasWidth, KeyHandler.canvasHeight, this.canvas); // L: 190 if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); + this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 195 } - this.fullRedraw = true; + this.fullRedraw = true; // L: 196 this.resizeGame(); } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1526531599" + garbageValue = "1701018417" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-642312042" + descriptor = "(B)V", + garbageValue = "48" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; - int var2 = this.canvasY; - int var3 = this.contentWidth - Huffman.canvasWidth - var1; - int var4 = this.contentHeight - MouseRecorder.canvasHeight - var2; + int var1 = this.canvasX; // L: 203 + int var2 = this.canvasY; // L: 204 + int var3 = this.contentWidth - canvasWidth - var1; // L: 205 + int var4 = this.contentHeight - KeyHandler.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); - int var6 = 0; - int var7 = 0; + int var6 = 0; // L: 210 + int var7 = 0; // L: 211 if (var5 == this.frame) { - Insets var8 = this.frame.getInsets(); - var6 = var8.left; + Insets var8 = this.frame.getInsets(); // L: 213 + var6 = var8.left; // L: 214 var7 = var8.top; } - Graphics var10 = var5.getGraphics(); - var10.setColor(Color.black); + Graphics var10 = var5.getGraphics(); // L: 217 + var10.setColor(Color.black); // L: 218 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 219 } - if (var2 > 0) { + if (var2 > 0) { // L: 220 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { + if (var3 > 0) { // L: 221 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { + if (var4 > 0) { // L: 222 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { + } catch (Exception var9) { // L: 224 } } - } + } // L: 226 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" + descriptor = "(I)V", + garbageValue = "1296094559" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; - var1.removeKeyListener(KeyHandler.KeyHandler_instance); - var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field123 = -1; - java.awt.Canvas var2 = this.canvas; - var2.removeMouseListener(MouseHandler.MouseHandler_instance); - var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var2.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; - if (this.mouseWheelHandler != null) { + java.awt.Canvas var1 = this.canvas; // L: 229 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 231 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 232 + KeyHandler.field122 = -1; // L: 233 + ModeWhere.method5543(this.canvas); // L: 235 + if (this.mouseWheelHandler != null) { // L: 236 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); - class12.method157(this.canvas); - class131.method2690(this.canvas); - if (this.mouseWheelHandler != null) { + this.addCanvas(); // L: 237 + java.awt.Canvas var2 = this.canvas; // L: 238 + var2.setFocusTraversalKeysEnabled(false); // L: 240 + var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 241 + var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 242 + java.awt.Canvas var3 = this.canvas; // L: 244 + var3.addMouseListener(MouseHandler.MouseHandler_instance); // L: 246 + var3.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 247 + var3.addFocusListener(MouseHandler.MouseHandler_instance); // L: 248 + if (this.mouseWheelHandler != null) { // L: 250 this.mouseWheelHandler.addTo(this.canvas); } - this.method462(); - } + this.method533(); // L: 251 + } // L: 252 - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "346411464" + garbageValue = "-417163265" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { - ++GameEngine_redundantStartThreadCount; - if (GameEngine_redundantStartThreadCount >= 3) { - this.error("alreadyloaded"); - return; + if (gameEngine != null) { // L: 256 + ++GameEngine_redundantStartThreadCount; // L: 257 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 258 + this.error("alreadyloaded"); // L: 259 + return; // L: 260 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); - return; + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 262 + return; // L: 263 } - gameEngine = this; - Huffman.canvasWidth = var1; - MouseRecorder.canvasHeight = var2; - RunException.RunException_revision = var3; - RunException.RunException_applet = this; - if (taskHandler == null) { + gameEngine = this; // L: 265 + canvasWidth = var1; // L: 266 + KeyHandler.canvasHeight = var2; // L: 267 + RunException.RunException_revision = var3; // L: 268 + RunException.RunException_applet = this; // L: 269 + if (taskHandler == null) { // L: 270 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); - } catch (Exception var5) { - Timer.RunException_sendStackTrace((String)null, var5); - this.error("crash"); + taskHandler.newThreadTask(this, 1); // L: 271 + } catch (Exception var5) { // L: 273 + MilliClock.RunException_sendStackTrace((String)null, var5); // L: 274 + this.error("crash"); // L: 275 } - } + } // L: 277 - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1804120842" + descriptor = "(B)V", + garbageValue = "86" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); - if (this.canvas != null) { - this.canvas.removeFocusListener(this); - var1.remove(this.canvas); + Container var1 = this.container(); // L: 280 + if (this.canvas != null) { // L: 281 + this.canvas.removeFocusListener(this); // L: 282 + var1.remove(this.canvas); // L: 283 } - Huffman.canvasWidth = Math.max(var1.getWidth(), this.field179); - MouseRecorder.canvasHeight = Math.max(var1.getHeight(), this.field193); + canvasWidth = Math.max(var1.getWidth(), this.field184); // L: 285 + KeyHandler.canvasHeight = Math.max(var1.getHeight(), this.field185); // L: 286 Insets var2; - if (this.frame != null) { - var2 = this.frame.getInsets(); - Huffman.canvasWidth -= var2.left + var2.right; - MouseRecorder.canvasHeight -= var2.top + var2.bottom; + if (this.frame != null) { // L: 287 + var2 = this.frame.getInsets(); // L: 288 + canvasWidth -= var2.left + var2.right; // L: 289 + KeyHandler.canvasHeight -= var2.bottom + var2.top; // L: 290 } - this.canvas = new Canvas(this); - var1.setBackground(Color.BLACK); - var1.setLayout((LayoutManager)null); - var1.add(this.canvas); - this.canvas.setSize(Huffman.canvasWidth, MouseRecorder.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, var2.top + this.canvasY); + this.canvas = new Canvas(this); // L: 292 + var1.setBackground(Color.BLACK); // L: 293 + var1.setLayout((LayoutManager)null); // L: 294 + var1.add(this.canvas); // L: 295 + this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 296 + this.canvas.setVisible(true); // L: 297 + this.canvas.setBackground(Color.BLACK); // L: 298 + if (var1 == this.frame) { // L: 299 + var2 = this.frame.getInsets(); // L: 300 + this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 301 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 303 } - this.canvas.addFocusListener(this); - this.canvas.requestFocus(); - this.fullRedraw = true; - if (class244.rasterProvider != null && Huffman.canvasWidth == class244.rasterProvider.width && MouseRecorder.canvasHeight == class244.rasterProvider.height) { - ((RasterProvider)class244.rasterProvider).setComponent(this.canvas); - class244.rasterProvider.drawFull(0, 0); + this.canvas.addFocusListener(this); // L: 304 + this.canvas.requestFocus(); // L: 305 + this.fullRedraw = true; // L: 306 + if (Canvas.rasterProvider != null && canvasWidth == Canvas.rasterProvider.width && KeyHandler.canvasHeight == Canvas.rasterProvider.height) { // L: 307 + ((RasterProvider)Canvas.rasterProvider).setComponent(this.canvas); // L: 308 + Canvas.rasterProvider.drawFull(0, 0); // L: 309 } else { - class244.rasterProvider = new RasterProvider(Huffman.canvasWidth, MouseRecorder.canvasHeight, this.canvas); + Canvas.rasterProvider = new RasterProvider(canvasWidth, KeyHandler.canvasHeight, this.canvas); // L: 312 } - this.isCanvasInvalid = false; - this.field203 = UserComparator4.method2406(); - } + this.isCanvasInvalid = false; // L: 314 + this.field195 = class111.method2516(); // L: 315 + } // L: 316 - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1617567570" + garbageValue = "-597352233" ) @Export("checkHost") protected final boolean checkHost() { - 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")) { + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 319 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 320 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 321 + if (var1.endsWith("127.0.0.1")) { // L: 322 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); + var1 = var1.substring(0, var1.length() - 1); // L: 323 } - if (var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { // L: 324 return true; } else { - this.error("invalidhost"); - return false; + this.error("invalidhost"); // L: 325 + return false; // L: 326 } } } else { @@ -591,435 +595,694 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-47" + descriptor = "(I)V", + garbageValue = "-754121126" ) @Export("clientTick") void clientTick() { - long var1 = UserComparator4.method2406(); - long var3 = clientTickTimes[class139.field1537]; - clientTickTimes[class139.field1537] = var1; - class139.field1537 = class139.field1537 + 1 & 31; - if (0L != var3 && var1 > var3) { + long var1 = class111.method2516(); // L: 379 + long var3 = clientTickTimes[field178]; // L: 380 + clientTickTimes[field178] = var1; // L: 381 + field178 = field178 + 1 & 31; // L: 382 + if (0L != var3 && var1 > var3) { // L: 383 } - synchronized(this) { - KitDefinition.hasFocus = volatileFocus; - } + synchronized(this) { // L: 384 + WorldMapSectionType.hasFocus = volatileFocus; // L: 385 + } // L: 386 - this.doCycle(); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1115374200" - ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); - long var2 = UserComparator4.method2406(); - long var4 = graphicsTickTimes[field189]; - graphicsTickTimes[field189] = var2; - field189 = field189 + 1 & 31; - if (0L != var4 && var2 > var4) { - int var6 = (int)(var2 - var4); - fps = ((var6 >> 1) + 32000) / var6; - } - - if (++field200 - 1 > 50) { - field200 -= 50; - this.fullRedraw = true; - this.canvas.setSize(Huffman.canvasWidth, MouseRecorder.canvasHeight); - this.canvas.setVisible(true); - if (var1 == this.frame) { - Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); - } - } - - if (this.isCanvasInvalid) { - this.replaceCanvas(); - } - - this.method461(); - this.draw(this.fullRedraw); - if (this.fullRedraw) { - this.clearBackground(); - } - - this.fullRedraw = false; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-341516966" - ) - final void method461() { - Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { - this.resizeCanvas(); - this.resizeCanvasNextFrame = false; - } - - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "100" - ) - final void method462() { - this.resizeCanvasNextFrame = true; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1738301151" - ) - @Export("kill") - final synchronized void kill() { - if (!isKilled) { - isKilled = true; - - try { - this.canvas.removeFocusListener(this); - } catch (Exception var5) { - } - - try { - this.kill0(); - } catch (Exception var4) { - } - - if (this.frame != null) { - try { - System.exit(0); - } catch (Throwable var3) { - } - } - - if (taskHandler != null) { - try { - taskHandler.close(); - } catch (Exception var2) { - } - } - - this.vmethod1165(); - } - } + this.doCycle(); // L: 387 + } // L: 388 @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "940201361" + garbageValue = "25949374" + ) + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 391 + long var2 = class111.method2516(); // L: 392 + long var4 = graphicsTickTimes[class362.field4057]; // L: 393 + graphicsTickTimes[class362.field4057] = var2; // L: 394 + class362.field4057 = class362.field4057 + 1 & 31; // L: 395 + if (var4 != 0L && var2 > var4) { // L: 396 + int var6 = (int)(var2 - var4); // L: 397 + fps = ((var6 >> 1) + 32000) / var6; // L: 398 + } + + if (++field191 - 1 > 50) { // L: 400 + field191 -= 50; // L: 401 + this.fullRedraw = true; // L: 402 + this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 403 + this.canvas.setVisible(true); // L: 404 + if (var1 == this.frame) { // L: 405 + Insets var7 = this.frame.getInsets(); // L: 406 + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 407 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 409 + } + } + + if (this.isCanvasInvalid) { // L: 411 + this.replaceCanvas(); + } + + this.method449(); // L: 412 + this.draw(this.fullRedraw); // L: 413 + if (this.fullRedraw) { // L: 414 + this.clearBackground(); + } + + this.fullRedraw = false; // L: 415 + } // L: 416 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1812985306" + ) + final void method449() { + Bounds var1 = this.getFrameContentBounds(); // L: 419 + if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 420 + this.resizeCanvas(); // L: 421 + this.resizeCanvasNextFrame = false; // L: 422 + } + + } // L: 424 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1443705423" + ) + final void method533() { + this.resizeCanvasNextFrame = true; // L: 427 + } // L: 428 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1010664187" + ) + @Export("kill") + final synchronized void kill() { + if (!isKilled) { // L: 431 + isKilled = true; // L: 432 + + try { + this.canvas.removeFocusListener(this); // L: 434 + } catch (Exception var5) { // L: 436 + } + + try { + this.kill0(); // L: 438 + } catch (Exception var4) { // L: 440 + } + + if (this.frame != null) { // L: 441 + try { + System.exit(0); // L: 443 + } catch (Throwable var3) { // L: 445 + } + } + + if (taskHandler != null) { // L: 447 + try { + taskHandler.close(); // L: 449 + } catch (Exception var2) { // L: 451 + } + } + + this.vmethod1164(); // L: 453 + } + } // L: 454 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2071280922" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ab") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1675225894" + garbageValue = "466223513" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ad") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-296185885" + garbageValue = "1302395481" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(S)V", + garbageValue = "-9054" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "2025094069" + garbageValue = "-1526487406" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); - if (class185.fontHelvetica13 == null) { - class185.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - loginScreenFontMetrics = this.canvas.getFontMetrics(class185.fontHelvetica13); + Graphics var4 = this.canvas.getGraphics(); // L: 514 + if (class115.fontHelvetica13 == null) { // L: 515 + class115.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 516 + class28.loginScreenFontMetrics = this.canvas.getFontMetrics(class115.fontHelvetica13); // L: 517 } - if (var3) { - var4.setColor(Color.black); - var4.fillRect(0, 0, Huffman.canvasWidth, MouseRecorder.canvasHeight); + if (var3) { // L: 519 + var4.setColor(Color.black); // L: 520 + var4.fillRect(0, 0, canvasWidth, KeyHandler.canvasHeight); // L: 521 } - Color var5 = new Color(140, 17, 17); + Color var5 = new Color(140, 17, 17); // L: 523 try { - if (class1.field3 == null) { - class1.field3 = this.canvas.createImage(304, 34); + if (class19.field89 == null) { // L: 525 + class19.field89 = this.canvas.createImage(304, 34); } - Graphics var6 = class1.field3.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(class185.fontHelvetica13); - var6.setColor(Color.white); - var6.drawString(var2, (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class1.field3, Huffman.canvasWidth / 2 - 152, MouseRecorder.canvasHeight / 2 - 18, (ImageObserver)null); - } catch (Exception var9) { - int var7 = Huffman.canvasWidth / 2 - 152; - int var8 = MouseRecorder.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(class185.fontHelvetica13); - var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + Graphics var6 = class19.field89.getGraphics(); // L: 526 + var6.setColor(var5); // L: 527 + var6.drawRect(0, 0, 303, 33); // L: 528 + var6.fillRect(2, 2, var1 * 3, 30); // L: 529 + var6.setColor(Color.black); // L: 530 + var6.drawRect(1, 1, 301, 31); // L: 531 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 532 + var6.setFont(class115.fontHelvetica13); // L: 533 + var6.setColor(Color.white); // L: 534 + var6.drawString(var2, (304 - class28.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 535 + var4.drawImage(class19.field89, canvasWidth / 2 - 152, KeyHandler.canvasHeight / 2 - 18, (ImageObserver)null); // L: 536 + } catch (Exception var9) { // L: 538 + int var7 = canvasWidth / 2 - 152; // L: 539 + int var8 = KeyHandler.canvasHeight / 2 - 18; // L: 540 + var4.setColor(var5); // L: 541 + var4.drawRect(var7, var8, 303, 33); // L: 542 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 543 + var4.setColor(Color.black); // L: 544 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 545 + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 546 + var4.setFont(class115.fontHelvetica13); // L: 547 + var4.setColor(Color.white); // L: 548 + var4.drawString(var2, var7 + (304 - class28.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 549 } - } catch (Exception var10) { - this.canvas.repaint(); + } catch (Exception var10) { // L: 552 + this.canvas.repaint(); // L: 553 } + } // L: 555 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1801681604" + ) + protected final void method508() { + class19.field89 = null; // L: 558 + class115.fontHelvetica13 = null; // L: 559 + class28.loginScreenFontMetrics = null; // L: 560 + } // L: 561 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1990615273" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 564 + this.hasErrored = true; // L: 565 + System.out.println("error_game_" + var1); // L: 566 + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 568 + } catch (Exception var3) { // L: 570 + } + + } + } // L: 571 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "-2036429987" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 574 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)Lmo;", + garbageValue = "1380374752" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 579 + int var2 = Math.max(var1.getWidth(), this.field184); // L: 580 + int var3 = Math.max(var1.getHeight(), this.field185); // L: 581 + if (this.frame != null) { // L: 582 + Insets var4 = this.frame.getInsets(); // L: 583 + var2 -= var4.right + var4.left; // L: 584 + var3 -= var4.bottom + var4.top; // L: 585 + } + + return new Bounds(var2, var3); // L: 587 } @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1537678468" - ) - protected final void method474() { - class1.field3 = null; - class185.fontHelvetica13 = null; - loginScreenFontMetrics = null; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-225365347" - ) - @Export("error") - protected void error(String var1) { - if (!this.hasErrored) { - this.hasErrored = true; - System.out.println("error_game_" + var1); - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); - } catch (Exception var3) { - } - - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "306371774" - ) - @Export("container") - Container container() { - return (Container)(this.frame != null ? this.frame : this); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)Lme;", - garbageValue = "-1028709613" - ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field179); - int var3 = Math.max(var1.getHeight(), this.field193); - if (this.frame != null) { - Insets var4 = this.frame.getInsets(); - var2 -= var4.right + var4.left; - var3 -= var4.bottom + var4.top; - } - - return new Bounds(var2, var3); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1668739330" + descriptor = "(S)Z", + garbageValue = "1980" ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; + return this.frame != null; // L: 591 } - @ObfuscatedName("ag") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1826906753" + descriptor = "(B)V", + garbageValue = "-71" ) - protected abstract void vmethod1165(); + protected abstract void vmethod1164(); public final void destroy() { - if (this == gameEngine && !isKilled) { - stopTimeMs = UserComparator4.method2406(); - class121.method2542(5000L); - this.kill(); + if (this == gameEngine && !isKilled) { // L: 467 + stopTimeMs = class111.method2516(); // L: 468 + FloorUnderlayDefinition.method3190(5000L); // L: 469 + this.kill(); // L: 470 } - } + } // L: 471 public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { - this.fullRedraw = true; - if (UserComparator4.method2406() - this.field203 > 1000L) { - Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= Huffman.canvasWidth && var2.height >= MouseRecorder.canvasHeight) { - this.isCanvasInvalid = true; + if (this == gameEngine && !isKilled) { // L: 478 + this.fullRedraw = true; // L: 479 + if (class111.method2516() - this.field195 > 1000L) { // L: 480 + Rectangle var2 = var1.getClipBounds(); // L: 481 + if (var2 == null || var2.width >= canvasWidth && var2.height >= KeyHandler.canvasHeight) { + this.isCanvasInvalid = true; // L: 482 } } } - } - - public void run() { - try { - if (TaskHandler.javaVendor != null) { - String var1 = TaskHandler.javaVendor.toLowerCase(); - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = TaskHandler.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_")) { - int var3; - for (var3 = 6; var3 < var2.length() && class65.isDigit(var2.charAt(var3)); ++var3) { - } - - String var4 = var2.substring(6, var3); - if (LoginType.isNumber(var4) && class279.method5134(var4) < 10) { - this.error("wrongjava"); - return; - } - } - - fiveOrOne = 5; - } - } - - this.setFocusCycleRoot(true); - this.addCanvas(); - this.setUp(); - LoginPacket.clock = AbstractWorldMapIcon.method3943(); - - while (stopTimeMs == 0L || UserComparator4.method2406() < stopTimeMs) { - gameCyclesToDo = LoginPacket.clock.wait(cycleDurationMillis, fiveOrOne); - - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { - this.clientTick(); - } - - this.graphicsTick(); - this.post(this.canvas); - } - } catch (Exception var6) { - Timer.RunException_sendStackTrace((String)null, var6); - this.error("crash"); - } - - this.kill(); - } - - public final void stop() { - if (this == gameEngine && !isKilled) { - stopTimeMs = UserComparator4.method2406() + 4000L; - } - } - - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.fullRedraw = true; - } - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; - } - - public final void windowActivated(WindowEvent var1) { - } - - public final void windowClosed(WindowEvent var1) { - } + } // L: 484 public final void windowClosing(WindowEvent var1) { - this.destroy(); - } + this.destroy(); // L: 499 + } // L: 500 public final void windowIconified(WindowEvent var1) { - } - - public final void windowOpened(WindowEvent var1) { - } - - public final void windowDeactivated(WindowEvent var1) { - } + } // L: 504 public final void start() { - if (this == gameEngine && !isKilled) { - stopTimeMs = 0L; + if (this == gameEngine && !isKilled) { // L: 457 + stopTimeMs = 0L; // L: 458 } - } + } // L: 459 + + public final void windowClosed(WindowEvent var1) { + } // L: 496 public final void windowDeiconified(WindowEvent var1) { - } + } // L: 503 + + public final void windowOpened(WindowEvent var1) { + } // L: 505 public abstract void init(); + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 492 + } // L: 493 + + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 462 + stopTimeMs = class111.method2516() + 4000L; // L: 463 + } + } // L: 464 + + public final void windowActivated(WindowEvent var1) { + } // L: 495 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 487 + this.fullRedraw = true; // L: 488 + } // L: 489 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 502 + + public final void update(Graphics var1) { + this.paint(var1); // L: 474 + } // L: 475 + + public void run() { + try { + if (TaskHandler.javaVendor != null) { // L: 331 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 332 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 333 + String var2 = GrandExchangeOfferAgeComparator.javaVersion; // L: 334 + 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: 335 + this.error("wrongjava"); // L: 336 + return; // L: 337 + } + + if (var2.startsWith("1.6.0_")) { // L: 339 + int var3; + for (var3 = 6; var3 < var2.length() && class117.isDigit(var2.charAt(var3)); ++var3) { // L: 340 341 + } + + String var4 = var2.substring(6, var3); // L: 342 + if (class129.isNumber(var4) && TaskHandler.method2881(var4) < 10) { // L: 343 + this.error("wrongjava"); // L: 344 + return; // L: 345 + } + } + + fiveOrOne = 5; // L: 348 + } + } + + this.setFocusCycleRoot(true); // L: 351 + this.addCanvas(); // L: 352 + this.setUp(); // L: 353 + + Object var8; + try { + var8 = new NanoClock(); // L: 357 + } catch (Throwable var6) { // L: 359 + var8 = new MilliClock(); // L: 360 + } + + Clock.clock = (Clock)var8; // L: 363 + + while (stopTimeMs == 0L || class111.method2516() < stopTimeMs) { // L: 364 + class1.gameCyclesToDo = Clock.clock.wait(cycleDurationMillis, fiveOrOne); // L: 365 + + for (int var5 = 0; var5 < class1.gameCyclesToDo; ++var5) { // L: 366 + this.clientTick(); + } + + this.graphicsTick(); // L: 367 + this.post(this.canvas); // L: 368 + } + } catch (Exception var7) { // L: 371 + MilliClock.RunException_sendStackTrace((String)null, var7); // L: 372 + this.error("crash"); // L: 373 + } + + this.kill(); // L: 375 + } // L: 376 + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "83" + descriptor = "(I)I", + garbageValue = "-1953693522" ) - static final boolean method510() { - return ViewportMouse.ViewportMouse_isInViewport; + public static int method584() { + return KeyHandler.KeyHandler_idleCycles; // L: 134 } - @ObfuscatedName("ku") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljt;I)Ljava/lang/String;", - garbageValue = "-1670482877" + descriptor = "(Ljava/lang/CharSequence;Lni;I)Ljava/lang/String;", + garbageValue = "658724655" ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (Interpreter.Widget_unpackTargetMask(WorldMapRegion.getWidgetFlags(var0)) == 0) { + public static String method585(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 32 return null; } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + int var2 = 0; // L: 33 + + int var3; + for (var3 = var0.length(); var2 < var3 && Ignored.method6212(var0.charAt(var2)); ++var2) { // L: 34 35 + } + + while (var3 > var2 && Ignored.method6212(var0.charAt(var3 - 1))) { // L: 36 + --var3; + } + + int var4 = var3 - var2; // L: 37 + if (var4 >= 1 && var4 <= SecureRandomCallable.method2052(var1)) { // L: 38 + StringBuilder var5 = new StringBuilder(var4); // L: 39 + + for (int var6 = var2; var6 < var3; ++var6) { // L: 40 + char var7 = var0.charAt(var6); // L: 41 + boolean var8; + if (Character.isISOControl(var7)) { // L: 44 + var8 = false; // L: 45 + } else if (ObjectComposition.isAlphaNumeric(var7)) { // L: 48 + var8 = true; // L: 49 + } else { + char[] var9 = class383.field4236; // L: 53 + int var10 = 0; + + label93: + while (true) { + char var11; + if (var10 >= var9.length) { + var9 = class383.field4237; // L: 63 + + for (var10 = 0; var10 < var9.length; ++var10) { // L: 64 + var11 = var9[var10]; // L: 65 + if (var11 == var7) { // L: 66 + var8 = true; // L: 67 + break label93; // L: 68 + } + } + + var8 = false; // L: 72 + break; + } + + var11 = var9[var10]; // L: 55 + if (var7 == var11) { // L: 56 + var8 = true; // L: 57 + break; // L: 58 + } + + ++var10; // L: 54 + } + } + + if (var8) { // L: 74 + char var12; + switch(var7) { // L: 77 + case ' ': + case '-': + case '_': + case ' ': + var12 = '_'; // L: 95 + break; // L: 96 + case '#': + case '[': + case ']': + var12 = var7; // L: 112 + break; // L: 113 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var12 = 'a'; // L: 154 + break; // L: 155 + case 'Ç': + case 'ç': + var12 = 'c'; // L: 116 + break; // L: 117 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var12 = 'e'; // L: 130 + break; // L: 131 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var12 = 'i'; // L: 103 + break; // L: 104 + case 'Ñ': + case 'ñ': + var12 = 'n'; // L: 107 + break; // L: 108 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var12 = 'o'; // L: 142 + break; // L: 143 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var12 = 'u'; // L: 89 + break; // L: 90 + case 'ß': + var12 = 'b'; // L: 157 + break; + case 'ÿ': + case 'Ÿ': + var12 = 'y'; // L: 120 + break; // L: 121 + default: + var12 = Character.toLowerCase(var7); // L: 79 + } + + if (var12 != 0) { + var5.append(var12); // L: 163 + } + } + } + + if (var5.length() == 0) { + return null; + } else { + return var5.toString(); + } + } else { + return null; + } + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lop;IIIIIII)V", + garbageValue = "1750259584" + ) + @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: 161 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 162 + + while (true) { + var7 = var0.readUnsignedByte(); // L: 164 + if (var7 == 0) { // L: 165 + if (var1 == 0) { // L: 166 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 167 + int var11 = var2 + var4 + 932731; // L: 170 + int var12 = var3 + var5 + 556238; // L: 171 + int var13 = class19.method291(var11 + 45365, var12 + 91923, 4) - 128 + (class19.method291(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class19.method291(var11, var12, 1) - 128 >> 2); // L: 173 + var13 = (int)(0.3D * (double)var13) + 35; // L: 174 + if (var13 < 10) { // L: 175 + var13 = 10; + } else if (var13 > 60) { // L: 176 + var13 = 60; + } + + var14[var3] = -var13 * 8; // L: 179 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 181 + } + break; + } + + if (var7 == 1) { // L: 184 + int var8 = var0.readUnsignedByte(); // L: 185 + if (var8 == 1) { // L: 186 + var8 = 0; + } + + if (var1 == 0) { // L: 187 + 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: 188 + } + break; + } + + if (var7 <= 49) { // L: 191 + Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 192 + Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 193 + Tiles.field969[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 194 + } else if (var7 <= 81) { // L: 197 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 198 + } else { + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 201 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 206 + if (var7 == 0) { // L: 207 + break; + } + + if (var7 == 1) { // L: 208 + var0.readUnsignedByte(); // L: 209 + break; + } + + if (var7 <= 49) { // L: 212 + var0.readUnsignedByte(); + } + } + } + + } // L: 215 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILbp;ZB)I", + garbageValue = "8" + ) + static int method555(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { // L: 2114 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2115 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = PlayerType.method5239(var3) ? 1 : 0; // L: 2116 + return 1; // L: 2117 + } else if (var0 == 3501) { // L: 2119 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2120 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Varps.method5007(var3) ? 1 : 0; // L: 2121 + return 1; // L: 2122 + } else if (var0 == 3502) { // L: 2124 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2125 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ItemComposition.method3403(var3) ? 1 : 0; // L: 2126 + return 1; // L: 2127 + } else { + return 2; // L: 2129 } } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index a3742317be..4a3758da55 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,98 +1,198 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hv") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -293523157 + intValue = 704202637 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -643482159 + intValue = -494879285 ) @Export("height") int height; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -104021669 + intValue = 211210251 ) @Export("centerX") int centerX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1641604505 + intValue = 1046564479 ) @Export("centerY") int centerY; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1488215561 - ) - @Export("orientation") - int orientation; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("t") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1181203843 + intValue = -1520193173 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -478459065 ) @Export("startX") int startX; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1333250787 + intValue = -849496909 ) @Export("endX") int endX; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1281231503 + intValue = 427250493 ) @Export("startY") int startY; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1442483421 + intValue = -1968764473 ) @Export("endY") int endY; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1764486953 + ) + int field2641; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -853367381 - ) - int field2637; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1665390773 + intValue = -1523827707 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -364049555401745921L + longValue = -6523351122347780293L ) @Export("tag") public long tag; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -321756317 + intValue = -269494523 ) @Export("flags") int flags; GameObject() { - this.tag = 0L; - this.flags = 0; + this.tag = 0L; // L: 16 + this.flags = 0; // L: 17 + } // L: 19 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lmp;ZB)V", + garbageValue = "38" + ) + public static void method4647(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { // L: 42 + try { + NetCache.NetCache_socket.close(); // L: 44 + } catch (Exception var8) { // L: 46 + } + + NetCache.NetCache_socket = null; // L: 47 + } + + NetCache.NetCache_socket = var0; // L: 49 + Buffer var2; + if (NetCache.NetCache_socket != null) { // L: 51 + try { + var2 = new Buffer(4); // L: 53 + var2.writeByte(var1 ? 2 : 3); // L: 54 + var2.writeMedium(0); // L: 55 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 56 + } catch (IOException var7) { + try { + NetCache.NetCache_socket.close(); // L: 60 + } catch (Exception var6) { // L: 62 + } + + ++NetCache.NetCache_ioExceptions; // L: 63 + NetCache.NetCache_socket = null; // L: 64 + } + } + + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 67 + class131.NetCache_currentResponse = null; // L: 68 + class138.NetCache_responseArchiveBuffer = null; // L: 69 + NetCache.field3707 = 0; // L: 70 + + while (true) { + NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 72 + if (var9 == null) { // L: 73 + while (true) { + var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 79 + if (var9 == null) { // L: 80 + if (NetCache.field3719 != 0) { // L: 86 + try { + var2 = new Buffer(4); // L: 88 + var2.writeByte(4); // L: 89 + var2.writeByte(NetCache.field3719); // L: 90 + var2.writeShort(0); // L: 91 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 92 + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); // L: 96 + } catch (Exception var4) { // L: 98 + } + + ++NetCache.NetCache_ioExceptions; // L: 99 + NetCache.NetCache_socket = null; // L: 100 + } + } + + NetCache.NetCache_loadTime = 0; // L: 103 + class423.field4436 = class111.method2516(); // L: 104 + return; // L: 105 + } + + NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 81 + NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 82 + ++NetCache.NetCache_pendingWritesCount; // L: 83 + --NetCache.NetCache_pendingResponsesCount; // L: 84 + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 74 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 75 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 76 + } } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(Ljf;IIIB)V", + garbageValue = "-109" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11713 + if (var4 != null) { // L: 11714 + if (Client.minimapState < 3) { // L: 11715 + class114.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: 11716 + } + + } + } // L: 11717 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index dbbb5a28d8..f82994c122 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,49 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("kt") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("t") - static byte[][][] field3760; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 663278445 + intValue = 1932555191 ) @Export("world") public final int world; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -5766229753192434851L + longValue = -3074264375035497163L ) @Export("age") public final long age; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lkh;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("offerName") String offerName; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lot;BI)V" + descriptor = "(Lop;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { - 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.method5407(2); - this.grandExchangeOffer.method5405(var2); + 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.method5454(2); // L: 118 + this.grandExchangeOffer.method5455(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -54,54 +52,82 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-117" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1492995549" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "7" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-681990835" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Loy;I)I", - garbageValue = "770443607" + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "1279033906" ) - static int method5402(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); + static String method5448(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 119 + if (var2 && var0 >= 0) { // L: 120 + int var3 = 2; // L: 121 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 122 123 125 + var4 /= var1; // L: 124 + } + + char[] var5 = new char[var3]; // L: 127 + var5[0] = '+'; // L: 128 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 129 + int var7 = var0; // L: 130 + var0 /= var1; // L: 131 + int var8 = var7 - var0 * var1; // L: 132 + if (var8 >= 10) { // L: 133 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 134 + } + } + + return new String(var5); // L: 136 + } else { + return Integer.toString(var0, var1); + } } else { - var2 = var0.readBits(11); + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljf;I)Ljava/lang/String;", + garbageValue = "-1477810111" + ) + static String method5449(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 10186 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 10187 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10189 + if (var3 == -1) { // L: 10190 + break; + } + + var0 = var0.substring(0, var3) + WorldMapLabelSize.method3534(class113.method2532(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10191 + } + } } - return var2; - } - - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "(I)Lna;", - garbageValue = "192669944" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return TileItem.worldMap; + return var0; // L: 10195 } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 984a127798..1b03232c93 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,165 +7,182 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("kx") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("events") public final List events; static { - GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); + GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); // L: 11 new GrandExchangeOfferWorldComparator(); - GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); - GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); + GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 + GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } + } // L: 67 @ObfuscatedSignature( - descriptor = "(Lot;Z)V", + descriptor = "(Lop;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.readUnsignedShort(); - boolean var4 = var1.readUnsignedByte() == 1; + int var3 = var1.readUnsignedShort(); // L: 82 + boolean var4 = var1.readUnsignedByte() == 1; // L: 83 byte var5; - if (var4) { + if (var4) { // L: 85 var5 = 1; } else { - var5 = 0; + var5 = 0; // L: 86 } - int var6 = var1.readUnsignedShort(); - this.events = new ArrayList(var6); + int var6 = var1.readUnsignedShort(); // L: 87 + this.events = new ArrayList(var6); // L: 88 - for (int var7 = 0; var7 < var6; ++var7) { - this.events.add(new GrandExchangeEvent(var1, var5, var3)); + for (int var7 = 0; var7 < var6; ++var7) { // L: 89 + this.events.add(new GrandExchangeEvent(var1, var5, var3)); // L: 90 } - } + } // L: 92 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "-1787305699" + descriptor = "(Ljava/util/Comparator;ZB)V", + garbageValue = "35" ) @Export("sort") public void sort(Comparator var1, boolean var2) { - if (var2) { - Collections.sort(this.events, var1); + if (var2) { // L: 95 + Collections.sort(this.events, var1); // L: 96 } else { - Collections.sort(this.events, Collections.reverseOrder(var1)); + Collections.sort(this.events, Collections.reverseOrder(var1)); // L: 99 } - } + } // L: 101 - @ObfuscatedName("f") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1446894624" + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "1979542286" ) - public static int method5348(int var0, int var1, int var2) { - int var3 = FloorOverlayDefinition.method3343(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(Ljt;III)V", - garbageValue = "135210928" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var5 = var0; - int var6 = Friend.method6003(WorldMapRegion.getWidgetFlags(var0)); - Widget var4; - int var7; - if (var6 == 0) { - var4 = null; - } else { - var7 = 0; - - while (true) { - if (var7 >= var6) { - var4 = var5; - break; - } - - var5 = HealthBarUpdate.getWidget(var5.parentId); - if (var5 == null) { - var4 = null; - break; - } - - ++var7; - } - } - - Widget var8 = var4; - if (var4 == null) { - var8 = var0.parent; - } - - if (var8 != null) { - Client.clickedWidget = var0; - var5 = var0; - var6 = Friend.method6003(WorldMapRegion.getWidgetFlags(var0)); - if (var6 == 0) { - var4 = null; - } else { - var7 = 0; - - while (true) { - if (var7 >= var6) { - var4 = var5; - break; - } - - var5 = HealthBarUpdate.getWidget(var5.parentId); - if (var5 == null) { - var4 = null; - break; - } - - ++var7; - } - } - - var8 = var4; - if (var4 == null) { - var8 = var0.parent; - } - - Client.clickedWidgetParent = var8; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - MouseHandler.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var9 = Client.menuOptionsCount - 1; - if (var9 != -1) { - NetFileRequest.method5216(var9); - } - - return; - } + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ItemContainer.getWidgetChild(var1, var2); // L: 9156 + if (var5 != null) { // L: 9157 + if (var5.onOp != null) { // L: 9158 + ScriptEvent var6 = new ScriptEvent(); // L: 9159 + var6.widget = var5; // L: 9160 + var6.opIndex = var0; // L: 9161 + var6.targetName = var4; // L: 9162 + var6.args = var5.onOp; // L: 9163 + Tile.runScriptEvent(var6); // L: 9164 } + boolean var11 = true; // L: 9166 + if (var5.contentType > 0) { // L: 9167 + var11 = GrandExchangeOfferAgeComparator.method5423(var5); + } + + if (var11) { // L: 9168 + int var8 = PendingSpawn.getWidgetFlags(var5); // L: 9170 + int var9 = var0 - 1; // L: 9171 + boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9173 + if (var7) { // L: 9175 + PacketBufferNode var10; + if (var0 == 1) { // L: 9178 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2686, Client.packetWriter.isaacCipher); // L: 9180 + var10.packetBuffer.writeInt(var1); // L: 9181 + var10.packetBuffer.writeShort(var2); // L: 9182 + var10.packetBuffer.writeShort(var3); // L: 9183 + Client.packetWriter.addNode(var10); // L: 9184 + } + + if (var0 == 2) { // L: 9186 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); // L: 9188 + var10.packetBuffer.writeInt(var1); // L: 9189 + var10.packetBuffer.writeShort(var2); // L: 9190 + var10.packetBuffer.writeShort(var3); // L: 9191 + Client.packetWriter.addNode(var10); // L: 9192 + } + + if (var0 == 3) { // L: 9194 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher); // L: 9196 + var10.packetBuffer.writeInt(var1); // L: 9197 + var10.packetBuffer.writeShort(var2); // L: 9198 + var10.packetBuffer.writeShort(var3); // L: 9199 + Client.packetWriter.addNode(var10); // L: 9200 + } + + if (var0 == 4) { // L: 9202 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2683, Client.packetWriter.isaacCipher); // L: 9204 + var10.packetBuffer.writeInt(var1); // L: 9205 + var10.packetBuffer.writeShort(var2); // L: 9206 + var10.packetBuffer.writeShort(var3); // L: 9207 + Client.packetWriter.addNode(var10); // L: 9208 + } + + if (var0 == 5) { // L: 9210 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2734, Client.packetWriter.isaacCipher); // L: 9212 + var10.packetBuffer.writeInt(var1); // L: 9213 + var10.packetBuffer.writeShort(var2); // L: 9214 + var10.packetBuffer.writeShort(var3); // L: 9215 + Client.packetWriter.addNode(var10); // L: 9216 + } + + if (var0 == 6) { // L: 9218 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 9220 + var10.packetBuffer.writeInt(var1); // L: 9221 + var10.packetBuffer.writeShort(var2); // L: 9222 + var10.packetBuffer.writeShort(var3); // L: 9223 + Client.packetWriter.addNode(var10); // L: 9224 + } + + if (var0 == 7) { // L: 9226 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2715, Client.packetWriter.isaacCipher); // L: 9228 + var10.packetBuffer.writeInt(var1); // L: 9229 + var10.packetBuffer.writeShort(var2); // L: 9230 + var10.packetBuffer.writeShort(var3); // L: 9231 + Client.packetWriter.addNode(var10); // L: 9232 + } + + if (var0 == 8) { // L: 9234 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2751, Client.packetWriter.isaacCipher); // L: 9236 + var10.packetBuffer.writeInt(var1); // L: 9237 + var10.packetBuffer.writeShort(var2); // L: 9238 + var10.packetBuffer.writeShort(var3); // L: 9239 + Client.packetWriter.addNode(var10); // L: 9240 + } + + if (var0 == 9) { // L: 9242 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2711, Client.packetWriter.isaacCipher); // L: 9244 + var10.packetBuffer.writeInt(var1); // L: 9245 + var10.packetBuffer.writeShort(var2); // L: 9246 + var10.packetBuffer.writeShort(var3); // L: 9247 + Client.packetWriter.addNode(var10); // L: 9248 + } + + if (var0 == 10) { // L: 9250 + var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2689, Client.packetWriter.isaacCipher); // L: 9252 + var10.packetBuffer.writeInt(var1); // L: 9253 + var10.packetBuffer.writeShort(var2); // L: 9254 + var10.packetBuffer.writeShort(var3); // L: 9255 + Client.packetWriter.addNode(var10); // L: 9256 + } + + } + } } - } + } // L: 9176 9258 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 9b008566f0..4c026b625c 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -1,147 +1,126 @@ -import java.net.MalformedURLException; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kh") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("state") byte state; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1281987013 + intValue = 174142221 ) @Export("id") public int id; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -552663155 + intValue = -2013850227 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1035394057 + intValue = 1123785695 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 8664505 + intValue = -1874435099 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1081967489 + intValue = 185412579 ) @Export("currentPrice") public int currentPrice; public GrandExchangeOffer() { - } + } // L: 13 @ObfuscatedSignature( - descriptor = "(Lot;Z)V", + descriptor = "(Lop;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { - this.state = var1.readByte(); - this.id = var1.readUnsignedShort(); - this.unitPrice = var1.readInt(); - this.totalQuantity = var1.readInt(); - this.currentQuantity = var1.readInt(); - this.currentPrice = var1.readInt(); - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-756750295" + garbageValue = "857978313" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2063429375" + garbageValue = "1294725733" ) @Export("type") public int type() { - return (this.state & 8) == 8 ? 1 : 0; + return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1077740822" + garbageValue = "-39336237" ) - void method5407(int var1) { - this.state &= -8; + void method5454(int var1) { + this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); - } + } // L: 60 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IB)V", + garbageValue = "-33" + ) + void method5455(int var1) { + this.state &= -9; // L: 63 + if (var1 == 1) { + this.state = (byte)(this.state | 8); // L: 64 + } + + } // L: 65 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(CB)Z", garbageValue = "0" ) - void method5405(int var1) { - this.state &= -9; - if (var1 == 1) { - this.state = (byte)(this.state | 8); - } - - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1182126654" - ) - static boolean method5406(String var0) { - if (var0 == null) { - return false; + public static boolean method5473(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 45 + return true; } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; + if (var0 != 0) { // L: 46 + char[] var1 = class316.cp1252AsciiExtension; // L: 48 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 + char var3 = var1[var2]; // L: 50 + if (var0 == var3) { // L: 52 + return true; // L: 53 + } + } } + + return false; // L: 59 } } - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-26148798" - ) - static void method5422() { - if (Client.field573 && class67.localPlayer != null) { - int var0 = class67.localPlayer.pathX[0]; - int var1 = class67.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - class132.oculusOrbFocalPointX = class67.localPlayer.x; - int var2 = MidiPcmStream.getTileHeight(class67.localPlayer.x, class67.localPlayer.y, VertexNormal.Client_plane) - Client.camFollowHeight; - if (var2 < class194.field2186) { - class194.field2186 = var2; - } - - LoginScreenAnimation.oculusOrbFocalPointY = class67.localPlayer.y; - Client.field573 = false; - } - - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 3c840d1ead..938af4722a 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -4,31 +4,72 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("kr") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("NpcDefinition_archive") - static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("w") + @Export("javaVersion") + public static String javaVersion; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;I)I", - garbageValue = "-124332954" + descriptor = "(Lkt;Lkt;I)I", + garbageValue = "-1967726110" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 21 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(Ljf;S)Z", + garbageValue = "-6395" + ) + static final boolean method5423(Widget var0) { + int var1 = var0.contentType; // L: 11600 + if (var1 == 205) { // L: 11601 + Client.logoutTimer = 250; // L: 11602 + return true; // L: 11603 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11605 + var2 = (var1 - 300) / 2; // L: 11606 + var3 = var1 & 1; // L: 11607 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11608 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11610 + var2 = (var1 - 314) / 2; // L: 11611 + var3 = var1 & 1; // L: 11612 + Client.playerAppearance.method5045(var2, var3 == 1); // L: 11613 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 11615 + } + + if (var1 == 325) { // L: 11616 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11617 + PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2688, Client.packetWriter.isaacCipher); // L: 11619 + Client.playerAppearance.write(var4.packetBuffer); // L: 11620 + Client.packetWriter.addNode(var4); // L: 11621 + return true; // L: 11622 + } else { + return false; // L: 11624 + } + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 8bd4653e3f..1e7a31a1b3 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -4,31 +4,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("km") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("re") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Leb;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;I)I", - garbageValue = "-1248352964" + descriptor = "(Lkt;Lkt;B)I", + garbageValue = "48" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.getOfferName().compareTo(var2.getOfferName()); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 64 + } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 56aaa4fee2..61d6fbd4f9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -3,114 +3,181 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bh") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("l") + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("i") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } + } // L: 12097 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;B)I", - garbageValue = "-39" + descriptor = "(Lkt;Lkt;I)I", + garbageValue = "1561546631" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { + if (var2.world == var1.world) { // L: 12100 return 0; } else { - if (this.filterWorlds) { - if (Client.worldId == var1.world) { + if (this.filterWorlds) { // L: 12101 + if (Client.worldId == var1.world) { // L: 12102 return -1; } - if (var2.world == Client.worldId) { + if (var2.world == Client.worldId) { // L: 12103 return 1; } } - return var1.world < var2.world ? -1 : 1; + return var1.world < var2.world ? -1 : 1; // L: 12105 } } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 12113 } - @ObfuscatedName("j") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12109 + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI)Lbe;", - garbageValue = "1110991115" + descriptor = "(IIIB)I", + garbageValue = "-90" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); + public static int method1162(int var0, int var1, int var2) { + int var3 = class123.method2619(var2 - var1 + 1); // L: 54 + var3 <<= var1; // L: 55 + var0 |= var3; // L: 56 + return var0; // L: 57 + } - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? InvDefinition.method2881(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbp;ZB)I", + garbageValue = "69" + ) + static int method1158(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3638 + class14.Interpreter_intStackSize -= 2; // L: 3639 + Client.field464 = (short)class9.method83(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]); // L: 3640 + if (Client.field464 <= 0) { // L: 3641 + Client.field464 = 256; } - } - var2.offset = 0; - var1.field956 = var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; + Client.field550 = (short)class9.method83(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 3642 + if (Client.field550 <= 0) { // L: 3643 + Client.field550 = 256; + } - 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(); + return 1; // L: 3644 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3646 + class14.Interpreter_intStackSize -= 2; // L: 3647 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3648 + if (Client.zoomHeight <= 0) { // L: 3649 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3650 + if (Client.zoomWidth <= 0) { // L: 3651 + Client.zoomWidth = 320; + } + + return 1; // L: 3652 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3654 + class14.Interpreter_intStackSize -= 4; // L: 3655 + Client.field727 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3656 + if (Client.field727 <= 0) { // L: 3657 + Client.field727 = 1; + } + + Client.field600 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3658 + if (Client.field600 <= 0) { // L: 3659 + Client.field600 = 32767; + } else if (Client.field600 < Client.field727) { // L: 3660 + Client.field600 = Client.field727; + } + + Client.field729 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3661 + if (Client.field729 <= 0) { // L: 3662 + Client.field729 = 1; + } + + Client.field730 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 3663 + if (Client.field730 <= 0) { // L: 3664 + Client.field730 = 32767; + } else if (Client.field730 < Client.field729) { // L: 3665 + Client.field730 = Client.field729; + } + + return 1; // L: 3666 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3668 + if (Client.viewportWidget != null) { // L: 3669 + SpriteMask.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3670 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3671 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3672 } else { - var1.intOperands[var7] = var2.readUnsignedByte(); + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3675 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3676 } + + return 1; // L: 3678 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3680 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3681 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3682 + return 1; // L: 3683 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3685 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MouseHandler.method626(Client.field464); // L: 3686 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MouseHandler.method626(Client.field550); // L: 3687 + return 1; // L: 3688 + } else if (var0 == 6220) { // L: 3690 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3691 + return 1; // L: 3692 + } else if (var0 == 6221) { // L: 3694 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3695 + return 1; // L: 3696 + } else if (var0 == 6222) { // L: 3698 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 3699 + return 1; // L: 3700 + } else if (var0 == 6223) { // L: 3702 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KeyHandler.canvasHeight; // L: 3703 + return 1; // L: 3704 + } else { + return 2; // L: 3706 } - - return var1; } - @ObfuscatedName("jh") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "20" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2002863284" ) - static final void method1104(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume = var0; - ScriptFrame.savePreferences(); - } + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11812 + PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2758, Client.packetWriter.isaacCipher); // L: 11814 + var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 11815 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11816 + Client.packetWriter.addNode(var1); // L: 11817 + } + } // L: 11818 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index eed05da001..431abf816e 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -5,111 +5,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("ki") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("bc") + @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = -698041547 + intValue = 682674069 ) - static int field3741; - @ObfuscatedName("ht") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "[Loz;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; + @Export("Client_plane") + static int Client_plane; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;B)I", - garbageValue = "-92" + descriptor = "(Lkt;Lkt;I)I", + garbageValue = "-289793267" ) @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); + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 } public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;I)V", - garbageValue = "482851304" - ) - public static void method5361(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "953318230" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class157.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - class157.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - class157.Widget_loadedInterfaces[var0] = true; - return true; - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1241356200" - ) - public static boolean method5360(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "117" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + return super.equals(var1); // L: 77 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index c283df0d39..9de97b95ee 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,31 +1,49 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kp") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("b") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; - - @ObfuscatedName("l") + @ObfuscatedName("te") + @ObfuscatedGetter( + longValue = 3905628072379123313L + ) + static long field3758; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;I)I", - garbageValue = "1882106044" + descriptor = "Lni;" + ) + @Export("loginType") + static LoginType loginType; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lkt;Lkt;B)I", + garbageValue = "-67" ) @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); - } - - public boolean equals(Object var1) { - return super.equals(var1); + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 51 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "64" + ) + static void method5485() { + ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 + } // L: 79 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 33185b26f6..c9dbd1ce64 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,47 +1,72 @@ +import java.applet.Applet; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kx") +@ObfuscatedName("ku") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkd;Lkd;S)I", - garbageValue = "-48" + descriptor = "(Lkt;Lkt;I)I", + garbageValue = "2143976852" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); + return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 36 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 } - @ObfuscatedName("kh") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljt;II)Ljava/lang/String;", - garbageValue = "-1694871012" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", + garbageValue = "1" ) - static String method5385(Widget var0, int var1) { - if (!class138.method2756(WorldMapRegion.getWidgetFlags(var0), var1) && var0.onOp == null) { - return null; + public static void method5440(Applet var0, String var1) { + class29.field157 = var0; // L: 22 + if (var1 != null) { // L: 23 + class29.field158 = var1; + } + + } // L: 24 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-879022560" + ) + static int method5439(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1267 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1268 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.x; // L: 1269 + return 1; // L: 1270 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1272 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.y; // L: 1273 + return 1; // L: 1274 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1276 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.width; // L: 1277 + return 1; // L: 1278 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1280 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.height; // L: 1281 + return 1; // L: 1282 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1284 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1285 + return 1; // L: 1286 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1288 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.parentId; // L: 1289 + return 1; // L: 1290 } else { - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; + return 2; // L: 1292 } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index d161d74331..f6dceb2837 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,125 +4,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("ms") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1639675523 + intValue = -739361475 ) @Export("compass") public int compass; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 702136855 + intValue = -1809731737 ) - public int field4014; - @ObfuscatedName("f") + public int field4008; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1524325723 + intValue = -300526741 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1995759 + intValue = -992628361 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 355364427 + intValue = 73683081 ) - public int field4017; - @ObfuscatedName("k") + public int field4011; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2123724991 + intValue = 956702641 ) - public int field4015; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2071632403 - ) - public int field4018; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 247766687 - ) - public int field4020; + public int field4012; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1327496497 - ) - public int field4019; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1467597659 - ) - public int field4022; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1123526163 + intValue = 1020186077 ) public int field4013; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 952149899 + ) + public int field4014; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1217039673 + ) + public int field4010; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1826235811 + ) + public int field4018; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1004681241 + ) + public int field4016; public GraphicsDefaults() { - this.compass = -1; - this.field4014 = -1; - this.mapScenes = -1; - this.headIconsPk = -1; - this.field4017 = -1; - this.field4015 = -1; - this.field4018 = -1; - this.field4020 = -1; - this.field4019 = -1; - this.field4022 = -1; - this.field4013 = -1; + this.compass = -1; // L: 7 + this.field4008 = -1; // L: 8 + this.mapScenes = -1; // L: 9 + this.headIconsPk = -1; // L: 10 + this.field4011 = -1; // L: 11 + this.field4012 = -1; // L: 12 + this.field4013 = -1; // L: 13 + this.field4014 = -1; // L: 14 + this.field4010 = -1; // L: 15 + this.field4018 = -1; // L: 16 + this.field4016 = -1; // L: 17 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;B)V", - garbageValue = "3" + descriptor = "(Lko;I)V", + garbageValue = "-1881093126" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4011.group); - Buffer var3 = new Buffer(var2); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4002.group); // L: 20 + Buffer var3 = new Buffer(var2); // L: 21 while (true) { - int var4 = var3.readUnsignedByte(); - if (var4 == 0) { - return; + int var4 = var3.readUnsignedByte(); // L: 23 + if (var4 == 0) { // L: 24 + return; // L: 51 } - switch(var4) { + switch(var4) { // L: 25 case 1: - var3.readMedium(); + var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method6977(); - this.field4014 = var3.method6977(); - this.mapScenes = var3.method6977(); - this.headIconsPk = var3.method6977(); - this.field4017 = var3.method6977(); - this.field4015 = var3.method6977(); - this.field4018 = var3.method6977(); - this.field4020 = var3.method6977(); - this.field4019 = var3.method6977(); - this.field4022 = var3.method6977(); - this.field4013 = var3.method6977(); + this.compass = var3.method6946(); // L: 36 + this.field4008 = var3.method6946(); // L: 37 + this.mapScenes = var3.method6946(); // L: 38 + this.headIconsPk = var3.method6946(); // L: 39 + this.field4011 = var3.method6946(); // L: 40 + this.field4012 = var3.method6946(); // L: 41 + this.field4013 = var3.method6946(); // L: 42 + this.field4014 = var3.method6946(); // L: 43 + this.field4010 = var3.method6946(); // L: 44 + this.field4018 = var3.method6946(); // L: 45 + this.field4016 = var3.method6946(); // L: 46 } } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-953550722" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - Players.addChatMessage(var0, var1, var2, (String)null); - } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 1cd675b30e..e04ccf7b3d 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -3,142 +3,258 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bs") +@ObfuscatedName("bo") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("tl") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1912460385 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Laj;" - ) - @Export("pcmPlayerProvider") - public static class45 pcmPlayerProvider; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1241403237 + intValue = 193750031 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1581300753 + intValue = -198143099 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -310896907 + intValue = 2072861117 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1472337471 + intValue = 1279579483 ) @Export("x") int x; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -798111629 + intValue = -817954883 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1131119735 + intValue = -2037596073 ) @Export("height") int height; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lfe;" + descriptor = "Lfm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1894648295 + intValue = -2011716423 ) @Export("frame") int frame; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 295957163 + intValue = 639704075 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("isFinished") boolean isFinished; public GraphicsObject() { - } GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - 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 = class21.SpotAnimationDefinition_get(this.id).sequence; - if (var8 != -1) { - this.isFinished = false; - this.sequenceDefinition = KitDefinition.SequenceDefinition_get(var8); + 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 = BZip2State.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + if (var8 != -1) { // L: 28 + this.isFinished = false; // L: 29 + this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var8); // L: 30 } else { - this.isFinished = true; + this.isFinished = true; // L: 32 } - } + } // L: 33 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-35" + garbageValue = "98" ) @Export("advance") - void advance(int var1) { - if (!this.isFinished) { - this.frameCycle += var1; + final void advance(int var1) { + if (!this.isFinished) { // L: 36 + this.frameCycle += var1; // L: 37 - 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; + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38 + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 39 + ++this.frame; // L: 40 + if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 41 + this.isFinished = true; // L: 42 break; } } } - } + } // L: 46 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") - protected Model getModel() { - SpotAnimationDefinition var1 = class21.SpotAnimationDefinition_get(this.id); + protected final Model getModel() { + SpotAnimationDefinition var1 = BZip2State.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; - if (!this.isFinished) { + if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); } else { - var2 = var1.getModel(-1); + var2 = var1.getModel(-1); // L: 52 } - return var2 == null ? null : var2; + return var2 == null ? null : var2; // L: 53 } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-2056514813" + ) + static int method1896(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1203 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1204 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var3)); // L: 1205 + return 1; // L: 1206 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1208 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1215 + if (var3.dataText == null) { // L: 1216 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1217 + } + + return 1; // L: 1218 + } else { + return 2; // L: 1220 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1209 + --var4; // L: 1210 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1211 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1212 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1213 + } + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(Lcx;IIII)V", + garbageValue = "1361246201" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (HealthBarDefinition.localPlayer != var0) { // L: 9585 + if (Client.menuOptionsCount < 400) { // L: 9586 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9588 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9589 + var7 = var0.combatLevel; // L: 9591 + int var8 = HealthBarDefinition.localPlayer.combatLevel; // L: 9592 + int var9 = var8 - var7; // L: 9594 + String var6; + if (var9 < -9) { // L: 9595 + var6 = MouseHandler.colorStartTag(16711680); // L: 9596 + } else if (var9 < -6) { // L: 9599 + var6 = MouseHandler.colorStartTag(16723968); // L: 9600 + } else if (var9 < -3) { // L: 9603 + var6 = MouseHandler.colorStartTag(16740352); // L: 9604 + } else if (var9 < 0) { // L: 9607 + var6 = MouseHandler.colorStartTag(16756736); // L: 9608 + } else if (var9 > 9) { // L: 9611 + var6 = MouseHandler.colorStartTag(65280); // L: 9612 + } else if (var9 > 6) { // L: 9615 + var6 = MouseHandler.colorStartTag(4259584); // L: 9616 + } else if (var9 > 3) { // L: 9619 + var6 = MouseHandler.colorStartTag(8453888); // L: 9620 + } else if (var9 > 0) { // L: 9623 + var6 = MouseHandler.colorStartTag(12648192); // L: 9624 + } else { + var6 = MouseHandler.colorStartTag(16776960); // L: 9627 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9629 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9631 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9632 + EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9633 + } else if (Client.isSpellSelected) { // L: 9636 + if ((class116.selectedSpellFlags & 8) == 8) { // L: 9637 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9638 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9643 + if (Client.playerMenuActions[var10] != null) { // L: 9644 + short var11 = 0; // L: 9645 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9646 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9647 + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > HealthBarDefinition.localPlayer.combatLevel) { // L: 9648 + var11 = 2000; // L: 9649 + } + + if (HealthBarDefinition.localPlayer.team != 0 && var0.team != 0) { // L: 9651 + if (var0.team == HealthBarDefinition.localPlayer.team) { // L: 9652 + var11 = 2000; + } else { + var11 = 0; // L: 9653 + } + } else if (AttackOption.field1226 == Client.playerAttackOption && var0.isClanMember()) { // L: 9655 + var11 = 2000; // L: 9656 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9659 + var11 = 2000; + } + + boolean var12 = false; // L: 9660 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9661 + EnumComposition.insertMenuItemNoShift(Client.playerMenuActions[var10], MouseHandler.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9662 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9667 + if (Client.menuOpcodes[var10] == 23) { // L: 9668 + Client.menuTargets[var10] = MouseHandler.colorStartTag(16777215) + var4; // L: 9669 + break; + } + } + + } + } + } // L: 9673 } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index b7a7c383e3..7758716ffb 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,169 +1,150 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("ce") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("f") + @ObfuscatedName("rt") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lak;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lfd;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lkf;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lfs;)V" + descriptor = "(Lfd;)V" ) HealthBar(HealthBarDefinition var1) { - this.updates = new IterableNodeDeque(); - this.definition = var1; - } + this.updates = new IterableNodeDeque(); // L: 12 + this.definition = var1; // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1577192016" + descriptor = "(IIIIB)V", + garbageValue = "0" ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; - int var6 = 0; + HealthBarUpdate var5 = null; // L: 19 + int var6 = 0; // L: 20 - 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; + 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 } if (var7.cycle <= var1) { - var5 = var7; + var5 = var7; // L: 27 } } - if (var5 == null) { - if (var6 < 4) { + if (var5 == null) { // L: 29 + if (var6 < 4) { // L: 30 this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } } else { - IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); + IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); // L: 33 if (var6 >= 4) { - this.updates.last().remove(); + this.updates.last().remove(); // L: 34 } } - } + } // L: 31 35 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IB)Lcp;", - garbageValue = "-18" + descriptor = "(II)Lcd;", + garbageValue = "655971331" ) @Export("get") HealthBarUpdate get(int var1) { - 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; + 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 } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 return var2; } else { - var2.remove(); - return null; + var2.remove(); // L: 49 + return null; // L: 50 } } else { return null; } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "126" + descriptor = "(I)Z", + garbageValue = "1027939055" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5563(); + return this.updates.method5633(); // L: 55 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Lfk;", - garbageValue = "-359923658" + descriptor = "(B)V", + garbageValue = "45" ) - public static FloorUnderlayDefinition method2214(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } + static void method2242() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 61 - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "0" - ) - static int method2220(int var0, Script var1, boolean var2) { - 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[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - NPCComposition var4 = class112.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } - } else { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - --class54.Interpreter_stringStackSize; - return 1; - } - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1149817369" - ) - static void method2221() { - if (Client.oculusOrbState == 1) { - Client.field573 = true; + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 62 + var1.clearIsFromIgnored(); // L: 64 } + } // L: 67 + + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZS)Ljava/lang/String;", + garbageValue = "-17378" + ) + static String method2246(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11925 + if (Client.gameBuild == 1) { // L: 11926 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11927 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11928 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11929 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11930 + var0 = "local"; + } + + String var3 = ""; // L: 11931 + if (UserComparator3.field1316 != null) { // L: 11932 + var3 = "/p=" + UserComparator3.field1316; + } + + String var4 = "runescape.com"; // L: 11933 + return var2 + var0 + "." + var4 + "/l=" + MouseHandler.clientLanguage + "/a=" + TextureProvider.field2483 + var3 + "/"; // L: 11934 } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 0e044f18ef..874d822c55 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,587 +4,215 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fd") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - @Export("HitSplatDefinition_spritesArchive") - static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("f") + public static AbstractArchive field1658; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("j") + static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = -1732997973 + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lko;" ) - static int field1671; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 975502943 + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "Lcx;" ) - public int field1675; - @ObfuscatedName("a") + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1349521857 + intValue = 1062567333 + ) + public int field1668; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1707673095 ) @Export("int1") public int int1; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1857884575 + intValue = -1065530521 ) @Export("int2") public int int2; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1029795251 + intValue = -2120739271 ) @Export("int3") public int int3; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -114651593 + ) + public int field1666; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1160024531 - ) - public int field1679; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -964299295 + intValue = -1513075709 ) @Export("int5") public int int5; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1825687109 + intValue = 1064156991 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2014691659 + intValue = -1238239581 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1639906499 + intValue = -638487751 ) @Export("width") public int width; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1780059389 + intValue = 1381174805 ) @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 } - public HealthBarDefinition() { - this.int1 = 255; - this.int2 = 255; - this.int3 = -1; - this.field1679 = 1; - this.int5 = 70; - this.frontSpriteID = -1; - this.backSpriteID = -1; - this.width = 30; - this.widthPadding = 0; - } + HealthBarDefinition() { + this.int1 = 255; // L: 19 + this.int2 = 255; // L: 20 + this.int3 = -1; // L: 21 + this.field1666 = 1; // L: 22 + this.int5 = 70; // L: 23 + this.frontSpriteID = -1; // L: 24 + this.backSpriteID = -1; // L: 25 + this.width = 30; // L: 26 + this.widthPadding = 0; // L: 27 + } // L: 29 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "81" + descriptor = "(Lop;B)V", + garbageValue = "36" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 43 + if (var2 == 0) { // L: 44 + return; // L: 47 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 45 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-410528163" + descriptor = "(Lop;IB)V", + garbageValue = "119" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - var1.readUnsignedShort(); - } else if (var2 == 2) { + if (var2 == 1) { // L: 50 + var1.readUnsignedShort(); // L: 51 + } else if (var2 == 2) { // L: 53 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 54 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 55 this.int3 = 0; - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 56 this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { - var1.readUnsignedByte(); - } else if (var2 == 7) { - this.frontSpriteID = var1.method6977(); - } else if (var2 == 8) { - this.backSpriteID = var1.method6977(); - } else if (var2 == 11) { + } else if (var2 == 6) { // L: 57 + var1.readUnsignedByte(); // L: 58 + } else if (var2 == 7) { // L: 60 + this.frontSpriteID = var1.method6946(); + } else if (var2 == 8) { // L: 61 + this.backSpriteID = var1.method6946(); + } else if (var2 == 11) { // L: 62 this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 63 this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { + } else if (var2 == 15) { // L: 64 this.widthPadding = var1.readUnsignedByte(); } - } + } // L: 66 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lon;", - garbageValue = "836195757" + descriptor = "(I)Low;", + garbageValue = "367034534" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { + if (this.frontSpriteID < 0) { // L: 69 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 if (var1 != null) { - return var1; + return var1; // L: 71 } else { - var1 = AccessFile.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); - if (var1 != null) { + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1658, this.frontSpriteID, 0); // L: 72 + if (var1 != null) { // L: 73 HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; + return var1; // L: 75 } } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lon;", - garbageValue = "18" + descriptor = "(I)Low;", + garbageValue = "1676501490" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { + if (this.backSpriteID < 0) { // L: 79 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 if (var1 != null) { - return var1; + return var1; // L: 81 } else { - var1 = AccessFile.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); - if (var1 != null) { + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1658, this.backSpriteID, 0); // L: 82 + if (var1 != null) { // L: 83 HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } - return var1; + return var1; // L: 85 } } } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;I)V", - garbageValue = "-2142706436" - ) - public static void method2978(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; - } - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1916121645" - ) - static final void method2977() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - class138.method2754(); - LoginScreenAnimation.method2175(); - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - WorldMapLabelSize.method3446(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - class276.method5122(); - VarbitComposition.VarbitDefinition_cached.clear(); - UserComparator4.method2395(); - TriBool.field3979.method6750(); - WorldMapIcon_1.HitSplatDefinition_cachedSprites.method6750(); - Clock.method2864(); - HealthBarDefinition_cached.clear(); - HealthBarDefinition_cachedSprites.clear(); - class11.method105(); - ParamComposition.ParamDefinition_cached.clear(); - MilliClock.method2858(); - PlayerComposition.PlayerAppearance_cachedModels.clear(); - KeyHandler.method349(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - ClanChannel.archive0.clearFiles(); - MouseRecorder.archive1.clearFiles(); - class150.archive3.clearFiles(); - class260.archive4.clearFiles(); - ApproximateRouteStrategy.archive5.clearFiles(); - Tiles.archive6.clearFiles(); - Skeleton.archive7.clearFiles(); - class176.archive8.clearFiles(); - Interpreter.archive9.clearFiles(); - UserComparator8.archive10.clearFiles(); - class4.archive11.clearFiles(); - UserComparator6.archive12.clearFiles(); - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(Lid;I)V", - garbageValue = "-637242019" - ) - static final void method2981(class240 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - TileItem var34; - if (class240.field2772 == var0) { - var2 = var1.method6933(); - var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + UrlRequest.field1313; - var5 = (var3 & 7) + WorldMapElement.field1622; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - NodeDeque var36 = Client.groundItems[VertexNormal.Client_plane][var4][var5]; - if (var36 != null) { - for (var34 = (TileItem)var36.last(); var34 != null; var34 = (TileItem)var36.previous()) { - if ((var2 & 32767) == var34.id) { - var34.remove(); - break; - } - } - - if (var36.last() == null) { - Client.groundItems[VertexNormal.Client_plane][var4][var5] = null; - } - - HealthBarUpdate.updateItemPile(var4, var5); - } - } - - } else { - int var6; - int var7; - int var8; - int var9; - int var11; - if (class240.field2771 == var0) { - var2 = var1.method7059(); - var3 = var1.method6927(); - var4 = (var3 >> 4 & 7) + UrlRequest.field1313; - var5 = (var3 & 7) + WorldMapElement.field1622; - var6 = var1.method6925(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field690[var7]; - if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { - if (var9 == 0) { - BoundaryObject var35 = PlayerComposition.scene.method4219(VertexNormal.Client_plane, var4, var5); - if (var35 != null) { - var11 = InterfaceParent.Entity_unpackID(var35.tag); - if (var7 == 2) { - var35.renderable1 = new DynamicObject(var11, 2, var8 + 4, VertexNormal.Client_plane, var4, var5, var2, false, var35.renderable1); - var35.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, VertexNormal.Client_plane, var4, var5, var2, false, var35.renderable2); - } else { - var35.renderable1 = new DynamicObject(var11, var7, var8, VertexNormal.Client_plane, var4, var5, var2, false, var35.renderable1); - } - } - } - - if (var9 == 1) { - WallDecoration var42 = PlayerComposition.scene.method4316(VertexNormal.Client_plane, var4, var5); - if (var42 != null) { - var11 = InterfaceParent.Entity_unpackID(var42.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var42.renderable1 = new DynamicObject(var11, 4, var8 + 4, VertexNormal.Client_plane, var4, var5, var2, false, var42.renderable1); - } else if (var7 == 7) { - var42.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, VertexNormal.Client_plane, var4, var5, var2, false, var42.renderable1); - } else if (var7 == 8) { - var42.renderable1 = new DynamicObject(var11, 4, var8 + 4, VertexNormal.Client_plane, var4, var5, var2, false, var42.renderable1); - var42.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, VertexNormal.Client_plane, var4, var5, var2, false, var42.renderable2); - } - } else { - var42.renderable1 = new DynamicObject(var11, 4, var8, VertexNormal.Client_plane, var4, var5, var2, false, var42.renderable1); - } - } - } - - if (var9 == 2) { - GameObject var43 = PlayerComposition.scene.getGameObject(VertexNormal.Client_plane, var4, var5); - if (var7 == 11) { - var7 = 10; - } - - if (var43 != null) { - var43.renderable = new DynamicObject(InterfaceParent.Entity_unpackID(var43.tag), var7, var8, VertexNormal.Client_plane, var4, var5, var2, false, var43.renderable); - } - } - - if (var9 == 3) { - FloorDecoration var44 = PlayerComposition.scene.getFloorDecoration(VertexNormal.Client_plane, var4, var5); - if (var44 != null) { - var44.renderable = new DynamicObject(InterfaceParent.Entity_unpackID(var44.tag), 22, var8, VertexNormal.Client_plane, var4, var5, var2, false, var44.renderable); - } - } - } - - } else if (class240.field2770 == var0) { - var2 = var1.method6925(); - var3 = var1.readUnsignedShort(); - var4 = var1.method6925(); - var5 = (var4 >> 4 & 7) + UrlRequest.field1313; - var6 = (var4 & 7) + WorldMapElement.field1622; - var7 = var1.method6933(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - GraphicsObject var41 = new GraphicsObject(var7, VertexNormal.Client_plane, var5, var6, MidiPcmStream.getTileHeight(var5, var6, VertexNormal.Client_plane) - var2, var3, Client.cycle); - Client.graphicsObjects.addFirst(var41); - } - - } else { - int var10; - if (class240.field2767 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method6927(); - var4 = var3 >> 4 & 15; - var5 = var3 & 7; - var6 = var1.method6925(); - var7 = (var6 >> 4 & 7) + UrlRequest.field1313; - var8 = (var6 & 7) + WorldMapElement.field1622; - var9 = var1.method6927(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var10 = var4 + 1; - if (class67.localPlayer.pathX[0] >= var7 - var10 && class67.localPlayer.pathX[0] <= var7 + var10 && class67.localPlayer.pathY[0] >= var8 - var10 && class67.localPlayer.pathY[0] <= var8 + var10 && WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume != 0 && var5 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var2; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var5; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var4 + (var8 << 8) + (var7 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class240.field2768 == var0) { - var2 = var1.method6927(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field690[var3]; - var6 = var1.readUnsignedShort(); - var7 = var1.method6925(); - var8 = (var7 >> 4 & 7) + UrlRequest.field1313; - var9 = (var7 & 7) + WorldMapElement.field1622; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { - class113.updatePendingSpawn(VertexNormal.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); - } - - } else if (class240.field2774 == var0) { - var2 = var1.method7059(); - var3 = var1.method6926(); - var4 = (var3 >> 4 & 7) + UrlRequest.field1313; - var5 = (var3 & 7) + WorldMapElement.field1622; - var6 = var1.method6934(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var34 = new TileItem(); - var34.id = var2; - var34.quantity = var6; - if (Client.groundItems[VertexNormal.Client_plane][var4][var5] == null) { - Client.groundItems[VertexNormal.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[VertexNormal.Client_plane][var4][var5].addFirst(var34); - HealthBarUpdate.updateItemPile(var4, var5); - } - - } else if (class240.field2776 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method6933(); - var4 = var1.method6934(); - var5 = var1.readUnsignedByte(); - var6 = (var5 >> 4 & 7) + UrlRequest.field1313; - var7 = (var5 & 7) + WorldMapElement.field1622; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var32 = Client.groundItems[VertexNormal.Client_plane][var6][var7]; - if (var32 != null) { - for (TileItem var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { - if ((var3 & 32767) == var33.id && var2 == var33.quantity) { - var33.quantity = var4; - break; - } - } - - HealthBarUpdate.updateItemPile(var6, var7); - } - } - - } else { - int var12; - int var13; - int var14; - byte var38; - if (class240.field2775 == var0) { - var2 = var1.method6936(); - var38 = var1.readByte(); - var4 = var1.method6934(); - var5 = var1.method6927(); - var6 = var1.method7059(); - var7 = var1.method6925() * 4; - var8 = var1.method6927(); - var9 = (var8 >> 4 & 7) + UrlRequest.field1313; - var10 = (var8 & 7) + WorldMapElement.field1622; - var11 = var1.method6926(); - byte var40 = var1.method6929(); - var13 = var1.method6933(); - var14 = var1.readUnsignedByte() * 4; - var12 = var40 + var9; - var3 = var38 + var10; - if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var12 >= 0 && var3 >= 0 && var12 < 104 && var3 < 104 && var6 != 65535) { - var9 = var9 * 128 + 64; - var10 = var10 * 128 + 64; - var12 = var12 * 128 + 64; - var3 = var3 * 128 + 64; - Projectile var31 = new Projectile(var6, VertexNormal.Client_plane, var9, var10, MidiPcmStream.getTileHeight(var9, var10, VertexNormal.Client_plane) - var7, var4 + Client.cycle, var13 + Client.cycle, var11, var5, var2, var14); - var31.setDestination(var12, var3, MidiPcmStream.getTileHeight(var12, var3, VertexNormal.Client_plane) - var14, var4 + Client.cycle); - Client.projectiles.addFirst(var31); - } - - } else if (class240.field2769 == var0) { - var2 = var1.method6926(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field690[var3]; - var6 = var1.method6925(); - var7 = (var6 >> 4 & 7) + UrlRequest.field1313; - var8 = (var6 & 7) + WorldMapElement.field1622; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - class113.updatePendingSpawn(VertexNormal.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - - } else { - if (class240.field2773 == var0) { - byte var37 = var1.method6915(); - var38 = var1.method6929(); - var4 = var1.method6926(); - var5 = (var4 >> 4 & 7) + UrlRequest.field1313; - var6 = (var4 & 7) + WorldMapElement.field1622; - var7 = var1.readUnsignedShort(); - var8 = var1.method6934(); - byte var39 = var1.method6915(); - var10 = var1.readUnsignedShort(); - var11 = var1.method7059(); - var12 = var1.method6927(); - var13 = var12 >> 2; - var14 = var12 & 3; - int var15 = Client.field690[var13]; - byte var16 = var1.method6915(); - Player var17; - if (var10 == Client.localPlayerIndex) { - var17 = class67.localPlayer; - } else { - var17 = Client.players[var10]; - } - - if (var17 != null) { - ObjectComposition var18 = class245.getObjectDefinition(var8); - int var19; - int var20; - if (var14 != 1 && var14 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var5 + (var19 >> 1); - int var22 = var5 + (var19 + 1 >> 1); - int var23 = var6 + (var20 >> 1); - int var24 = var6 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[VertexNormal.Client_plane]; - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; - int var27 = (var5 << 7) + (var19 << 6); - int var28 = (var6 << 7) + (var20 << 6); - Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); - if (var29 != null) { - class113.updatePendingSpawn(VertexNormal.Client_plane, var5, var6, var15, -1, 0, 0, var11 + 1, var7 + 1); - var17.animationCycleStart = var11 + Client.cycle; - var17.animationCycleEnd = var7 + Client.cycle; - var17.model0 = var29; - var17.field1087 = var19 * 64 + var5 * 128; - var17.field1070 = var20 * 64 + var6 * 128; - var17.tileHeight2 = var26; - byte var30; - if (var39 > var37) { - var30 = var39; - var39 = var37; - var37 = var30; - } - - if (var38 > var16) { - var30 = var38; - var38 = var16; - var16 = var30; - } - - var17.minX = var5 + var39; - var17.maxX = var37 + var5; - var17.minY = var6 + var38; - var17.maxY = var6 + var16; - } - } - } - - } - } - } - } - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "69" - ) - static final void method2980() { - Client.field685 = Client.cycleCntr; - } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 9196d2c855..015bfbfb4e 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -4,195 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cd") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("tx") - @ObfuscatedSignature( - descriptor = "Lmm;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "[Lon;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("ih") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -251028917 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1748239019 + intValue = -400345829 ) @Export("cycle") int cycle; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 744846681 + intValue = -1402646487 ) @Export("health") int health; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1258923613 + intValue = -1279526783 ) @Export("health2") int health2; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2039342643 + intValue = 313548895 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; - } + this.cycle = var1; // L: 12 + this.health = var2; // L: 13 + this.health2 = var3; // L: 14 + this.cycleOffset = var4; // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "114" + descriptor = "(IIIII)V", + garbageValue = "2078509011" ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; - } + this.cycle = var1; // L: 19 + this.health = var2; // L: 20 + this.health2 = var3; // L: 21 + this.cycleOffset = var4; // L: 22 + } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Ljt;", - garbageValue = "-1645463338" + descriptor = "(Lko;I)V", + garbageValue = "1840987704" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = GrandExchangeOfferTotalQuantityComparator.loadInterface(var1); - if (!var3) { - return null; - } - } + public static void method2183(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; // L: 28 + } // L: 29 - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "328791269" + descriptor = "(IIB)I", + garbageValue = "44" ) - public static void method2161() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-28" - ) - static final void method2158() { - if (!ViewportMouse.ViewportMouse_false0) { - int var0 = Scene.Scene_cameraPitchSine; - int var1 = Scene.Scene_cameraPitchCosine; - int var2 = Scene.Scene_cameraYawSine; - int var3 = Scene.Scene_cameraYawCosine; - byte var4 = 50; - short var5 = 3500; - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var10 = Rasterizer3D.method4141(var7, var4, var1, var0); - int var11 = Rasterizer3D.method4183(var7, var4, var1, var0); - var7 = var10; - var10 = Rasterizer3D.method4141(var9, var5, var1, var0); - int var12 = Rasterizer3D.method4183(var9, var5, var1, var0); - var9 = var10; - var10 = Rasterizer3D.method4139(var6, var11, var3, var2); - var11 = Rasterizer3D.method4125(var6, var11, var3, var2); - var6 = var10; - var10 = Rasterizer3D.method4139(var8, var12, var3, var2); - var12 = Rasterizer3D.method4125(var8, var12, var3, var2); - class122.field1426 = (var6 + var10) / 2; - ViewportMouse.field2585 = (var7 + var9) / 2; - DirectByteArrayCopier.field3212 = (var12 + var11) / 2; - MilliClock.field1588 = (var10 - var6) / 2; - ViewportMouse.field2579 = (var9 - var7) / 2; - class121.field1412 = (var12 - var11) / 2; - Interpreter.field829 = Math.abs(MilliClock.field1588); - ViewportMouse.field2580 = Math.abs(ViewportMouse.field2579); - class19.field98 = Math.abs(class121.field1412); - } - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1391228177" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[VertexNormal.Client_plane][var0][var1]; - if (var2 == null) { - PlayerComposition.scene.removeGroundItemPile(VertexNormal.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = class87.ItemDefinition_get(var6.id); - long var11 = (long)var7.price; - if (var7.isStackable == 1) { - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { - var3 = var11; - var5 = var6; - } - } - - if (var5 == null) { - PlayerComposition.scene.removeGroundItemPile(VertexNormal.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var13 = null; - TileItem var8 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var5.id != var6.id) { - if (var13 == null) { - var13 = var6; - } - - if (var13.id != var6.id && var8 == null) { - var8 = var6; - } - } - } - - long var9 = class247.calculateTag(var0, var1, 3, false, 0); - PlayerComposition.scene.newGroundItemPile(VertexNormal.Client_plane, var0, var1, MidiPcmStream.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, VertexNormal.Client_plane), var5, var9, var13, var8); - } - } + static int method2185(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 150 + return class131.NetCache_currentResponse != null && var2 == class131.NetCache_currentResponse.key ? class138.NetCache_responseArchiveBuffer.offset * 99 / (class138.NetCache_responseArchiveBuffer.array.length - class131.NetCache_currentResponse.padding) + 1 : 0; // L: 151 152 } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 21eabf3a44..668dafdf0e 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,655 +1,437 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fl") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("q") + static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - public static AbstractArchive field1799; - @ObfuscatedName("j") + static AbstractArchive field1799; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lko;" + ) + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lig;" ) @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("m") + public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("HitSplatDefinition_cachedSprites") - static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("HitSplatDefinition_cachedFonts") - static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("p") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -999465827 + intValue = -1566126037 ) @Export("fontId") int fontId; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1782308297 + intValue = -2057498117 ) @Export("textColor") public int textColor; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -690575575 + intValue = -960185975 ) - public int field1806; - @ObfuscatedName("s") + public int field1805; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 538257601 + intValue = -722283867 ) - int field1819; - @ObfuscatedName("c") + int field1809; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1981932247 + intValue = 1206908659 ) - int field1808; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1395271941 - ) - int field1805; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -928172535 - ) - int field1812; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1545387991 - ) - public int field1811; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -994625977 - ) - public int field1810; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1479947563 - ) - public int field1813; - @ObfuscatedName("o") - String field1814; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 823337209 - ) - public int field1815; + int field1813; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2097135353 + intValue = 289668931 ) - public int field1798; - @ObfuscatedName("u") - @Export("transforms") - public int[] transforms; + int field1798; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 349750373 + ) + int field1811; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -2034733799 + ) + public int field1812; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 223716691 + intValue = 1578977171 + ) + public int field1807; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -256974621 + ) + public int field1814; + @ObfuscatedName("m") + String field1815; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1437250481 + ) + public int field1816; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -379140099 + ) + public int field1820; + @ObfuscatedName("h") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 880580953 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1419928299 + intValue = 1573055713 ) @Export("transformVarp") int transformVarp; static { - HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); + HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 + HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 19 + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20 } HitSplatDefinition() { - this.fontId = -1; - this.textColor = 16777215; - this.field1806 = 70; - this.field1819 = -1; - this.field1808 = -1; - this.field1805 = -1; - this.field1812 = -1; - this.field1811 = 0; - this.field1810 = 0; - this.field1813 = -1; - this.field1814 = ""; - this.field1815 = -1; - this.field1798 = 0; - this.transformVarbit = -1; - this.transformVarp = -1; - } + this.fontId = -1; // L: 26 + this.textColor = 16777215; // L: 27 + this.field1805 = 70; // L: 28 + this.field1809 = -1; // L: 29 + this.field1813 = -1; // L: 30 + this.field1798 = -1; // L: 31 + this.field1811 = -1; // L: 32 + this.field1812 = 0; // L: 33 + this.field1807 = 0; // L: 34 + this.field1814 = -1; // L: 35 + this.field1815 = ""; // L: 36 + this.field1816 = -1; // L: 37 + this.field1820 = 0; // L: 38 + this.transformVarbit = -1; // L: 40 + this.transformVarp = -1; // L: 41 + } // L: 43 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "1" + descriptor = "(Lop;I)V", + garbageValue = "2128528466" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 63 + if (var2 == 0) { // L: 64 + return; // L: 67 } - this.decodeNext(var1, var2); - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1523469115" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.fontId = var1.method6977(); - } else if (var2 == 2) { - this.textColor = var1.readMedium(); - } else if (var2 == 3) { - this.field1819 = var1.method6977(); - } else if (var2 == 4) { - this.field1805 = var1.method6977(); - } else if (var2 == 5) { - this.field1808 = var1.method6977(); - } else if (var2 == 6) { - this.field1812 = var1.method6977(); - } else if (var2 == 7) { - this.field1811 = var1.readShort(); - } else if (var2 == 8) { - this.field1814 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { - this.field1806 = var1.readUnsignedShort(); - } else if (var2 == 10) { - this.field1810 = var1.readShort(); - } else if (var2 == 11) { - this.field1813 = 0; - } else if (var2 == 12) { - this.field1815 = var1.readUnsignedByte(); - } else if (var2 == 13) { - this.field1798 = var1.readShort(); - } else if (var2 == 14) { - this.field1813 = var1.readUnsignedShort(); - } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { - this.transformVarp = -1; - } - - int var3 = -1; - if (var2 == 18) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { - var3 = -1; - } - } - - int var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; - - 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; - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)Lfn;", - garbageValue = "29382351" - ) - @Export("transform") - public final HitSplatDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Varcs.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { - var1 = Varps.Varps_main[this.transformVarp]; - } - - int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; - } else { - var2 = this.transforms[this.transforms.length - 1]; - } - - return var2 != -1 ? ItemContainer.method2057(var2) : null; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1023856164" - ) - @Export("getString") - public String getString(int var1) { - String var2 = this.field1814; - - while (true) { - int var3 = var2.indexOf("%1"); - if (var3 < 0) { - return var2; - } - - var2 = var2.substring(0, var3) + class14.intToString(var1, false) + var2.substring(var3 + 2); - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Lon;", - garbageValue = "-335254490" - ) - public SpritePixels method3159() { - if (this.field1819 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1819); - if (var1 != null) { - return var1; - } else { - var1 = AccessFile.SpriteBuffer_getSprite(field1799, this.field1819, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1819); - } - - return var1; - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Lon;", - garbageValue = "-339502433" - ) - public SpritePixels method3160() { - if (this.field1808 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1808); - if (var1 != null) { - return var1; - } else { - var1 = AccessFile.SpriteBuffer_getSprite(field1799, this.field1808, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1808); - } - - return var1; - } + this.decodeNext(var1, var2); // L: 65 } } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lon;", - garbageValue = "325937960" + descriptor = "(Lop;II)V", + garbageValue = "-1870837993" ) - public SpritePixels method3161() { - if (this.field1805 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1805); - if (var1 != null) { - return var1; - } else { - var1 = AccessFile.SpriteBuffer_getSprite(field1799, this.field1805, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1805); - } - - return var1; + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 70 + this.fontId = var1.method6946(); + } else if (var2 == 2) { // L: 71 + this.textColor = var1.readMedium(); + } else if (var2 == 3) { // L: 72 + this.field1809 = var1.method6946(); + } else if (var2 == 4) { // L: 73 + this.field1798 = var1.method6946(); + } else if (var2 == 5) { // L: 74 + this.field1813 = var1.method6946(); + } else if (var2 == 6) { // L: 75 + this.field1811 = var1.method6946(); + } else if (var2 == 7) { // L: 76 + this.field1812 = var1.readShort(); + } else if (var2 == 8) { // L: 77 + this.field1815 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 78 + this.field1805 = var1.readUnsignedShort(); + } else if (var2 == 10) { // L: 79 + this.field1807 = var1.readShort(); + } else if (var2 == 11) { // L: 80 + this.field1814 = 0; + } else if (var2 == 12) { // L: 81 + this.field1816 = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 82 + this.field1820 = var1.readShort(); + } else if (var2 == 14) { + this.field1814 = 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.transformVarbit = -1; } + + this.transformVarp = var1.readUnsignedShort(); // L: 87 + if (this.transformVarp == 65535) { // L: 88 + this.transformVarp = -1; + } + + int var3 = -1; // L: 89 + if (var2 == 18) { // L: 90 + var3 = var1.readUnsignedShort(); // L: 91 + if (var3 == 65535) { // L: 92 + var3 = -1; + } + } + + int var4 = var1.readUnsignedByte(); // L: 94 + this.transforms = new int[var4 + 2]; // L: 95 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 96 + this.transforms[var5] = var1.readUnsignedShort(); // L: 97 + if (this.transforms[var5] == 65535) { // L: 98 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 100 + } + + } // L: 103 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lfl;", + garbageValue = "-1137405392" + ) + @Export("transform") + public final HitSplatDefinition transform() { + int var1 = -1; // L: 106 + if (this.transformVarbit != -1) { // L: 107 + var1 = class119.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 108 + var1 = Varps.Varps_main[this.transformVarp]; + } + + int var2; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110 + var2 = this.transforms[var1]; // L: 111 + } else { + var2 = this.transforms[this.transforms.length - 1]; + } + + return var2 != -1 ? Canvas.method372(var2) : null; // L: 112 113 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "2122770328" + ) + @Export("getString") + public String getString(int var1) { + String var2 = this.field1815; // L: 117 + + while (true) { + int var3 = var2.indexOf("%1"); // L: 119 + if (var3 < 0) { // L: 120 + return var2; // L: 123 + } + + var2 = var2.substring(0, var3) + MusicPatchNode2.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Lon;", - garbageValue = "-2096069020" + descriptor = "(I)Low;", + garbageValue = "1867638082" ) - public SpritePixels method3177() { - if (this.field1812 < 0) { + public SpritePixels method3256() { + if (this.field1809 < 0) { // L: 127 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1812); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1809); // L: 128 if (var1 != null) { - return var1; + return var1; // L: 129 } else { - var1 = AccessFile.SpriteBuffer_getSprite(field1799, this.field1812, 0); + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1809, 0); // L: 130 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1812); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1809); // L: 131 } - return var1; + return var1; // L: 133 } } } - @ObfuscatedName("i") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1973246933" + descriptor = "(B)Low;", + garbageValue = "-49" ) - @Export("getFont") - public Font getFont() { - if (this.fontId == -1) { + public SpritePixels method3286() { + if (this.field1813 < 0) { // L: 137 return null; } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1813); // L: 138 if (var1 != null) { - return var1; + return var1; // L: 139 } else { - var1 = Actor.method2153(field1799, class17.HitSplatDefinition_fontsArchive, this.fontId, 0); + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1813, 0); // L: 140 if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1813); // L: 141 } - return var1; + return var1; // L: 143 } } } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lkn;II)Lis;", - garbageValue = "1268577977" - ) - public static PacketBufferNode method3197(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2754, 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:")) { - 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()); - } 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(); - 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); - var4.packetBuffer.writeByte(var8); - class157.method2985(var4.packetBuffer, var1); - if (var0 == class269.field3219.rsOrdinal()) { - var4.packetBuffer.writeByte(var3); - } - - var4.packetBuffer.method6918(var4.packetBuffer.offset - var5); - return var4; - } - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIS)Lbo;", - garbageValue = "255" + descriptor = "(S)Low;", + garbageValue = "16101" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + public SpritePixels method3258() { + if (this.field1798 < 0) { // L: 147 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1798); // L: 148 + if (var1 != null) { + return var1; // L: 149 + } else { + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1798, 0); // L: 150 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1798); // L: 151 + } + + return var1; // L: 153 + } + } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lew;IIS)Laq;", - garbageValue = "-16257" + descriptor = "(B)Low;", + garbageValue = "64" ) - public static final PcmPlayer method3194(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field279 == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; + public SpritePixels method3281() { + if (this.field1811 < 0) { // L: 157 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1811); // L: 158 + if (var1 != null) { + return var1; // L: 159 + } else { + var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1811, 0); // L: 160 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1811); // L: 161 + } + + return var1; // L: 163 } + } + } - try { - PcmPlayer var3 = GraphicsObject.pcmPlayerProvider.player(); - var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; - var3.field272 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (PcmPlayer.field283 > 0 && Skeleton.soundSystem == null) { - Skeleton.soundSystem = new SoundSystem(); - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(Skeleton.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (Skeleton.soundSystem != null) { - if (Skeleton.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Lle;", + garbageValue = "-1825391526" + ) + @Export("getFont") + public Font getFont() { + if (this.fontId == -1) { // L: 167 + return null; + } else { + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168 + if (var1 != null) { // L: 169 + return var1; + } else { + AbstractArchive var3 = field1799; // L: 171 + AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 172 + int var5 = this.fontId; // L: 173 + Font var2; + if (!BuddyRankComparator.method2502(var3, var5, 0)) { // L: 175 + var2 = null; // L: 176 + } else { + byte[] var7 = var4.takeFile(var5, 0); // L: 180 + Font var6; + if (var7 == null) { // L: 182 + var6 = null; // L: 183 + } else { + Font var8 = new Font(var7, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 186 + PacketBuffer.method6913(); // L: 187 + var6 = var8; // L: 188 } - Skeleton.soundSystem.players[var1] = var3; + var2 = var6; // L: 190 } - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); + if (var2 != null) { // L: 193 + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } + + return var2; // L: 195 } - } else { - throw new IllegalArgumentException(); } } - @ObfuscatedName("is") + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "42" + descriptor = "(IIB)V", + garbageValue = "28" ) - static final void method3162(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; + static final void method3267(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class115.guestClanChannel; // L: 11828 + if (var2 != null && var1 >= 0 && var1 < var2.method2809()) { // L: 11829 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11830 + if (var3.rank == -1) { + String var4 = var3.username.getName(); // L: 11832 + PacketWriter var5 = Client.packetWriter; // L: 11833 + PacketBufferNode var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2750, var5.isaacCipher); // L: 11834 + var6.packetBuffer.writeByte(3 + Client.stringCp1252NullTerminatedByteSize(var4)); // L: 11835 + var6.packetBuffer.writeByte(var0); // L: 11836 + var6.packetBuffer.writeShort(var1); // L: 11837 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11838 + var5.addNode(var6); // L: 11839 } - - 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.method4127(var17, var18, var19); - Rasterizer3D.method4130(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method4127(var17, var19, var20); - Rasterizer3D.method4130(var21, var23, var24, var17, var19, var20, var4); } - } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1703178883" - ) - static String method3168(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (ItemContainer.field1009 != null) { - var3 = "/p=" + ItemContainer.field1009; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + ReflectionCheck.clientLanguage + "/a=" + KeyHandler.field142 + var3 + "/"; - } + } // L: 11831 11840 } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 2f5393450c..40b893ecd3 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,178 +1,136 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fj") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfj;" ) - field1708(0, 0), - @ObfuscatedName("q") + field1699(0, 0), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfj;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("f") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfj;" ) - field1707(1, 2); + field1694(2, 2); - @ObfuscatedName("j") + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1382972063 + intValue = 1219094331 ) @Export("value") public final int value; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2031336539 + intValue = 423871977 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 19 } - @ObfuscatedName("l") + @ObfuscatedName("i") + public static String method3113(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 + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lt;I)Lj;", - garbageValue = "177330026" + descriptor = "(II)Z", + garbageValue = "-1221922061" ) - public static class3 method3014(class6 var0) { - switch(var0.field18) { - case 0: - return new class0(); - default: - throw new IllegalArgumentException(); + public static boolean method3114(int var0) { + return (var0 >> 28 & 1) != 0; // L: 25 + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1099417797" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field687 = 0L; // L: 4556 + if (var0 >= 2) { // L: 4557 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 4558 } - } - @ObfuscatedName("hy") + if (class134.getWindowedMode() == 1) { // L: 4559 + ArchiveLoader.client.setMaxCanvasSize(765, 503); // L: 4560 + } else { + ArchiveLoader.client.setMaxCanvasSize(7680, 2160); // L: 4563 + } + + if (Client.gameState >= 25) { // L: 4565 + Frames.method4481(); + } + + } // L: 4566 + + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1291496924" + descriptor = "(IIIIIIIII)V", + garbageValue = "1045618476" ) - static final void method3008() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints > 0) { - --var0.hitpoints; + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class174.loadInterface(var0)) { // L: 9676 + NPC.field1207 = null; // L: 9683 + class28.drawInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9684 + if (NPC.field1207 != null) { // L: 9685 + class28.drawInterface(NPC.field1207, -1412584499, var1, var2, var3, var4, Varcs.field1263, class150.field1604, var7); // L: 9686 + NPC.field1207 = null; // L: 9687 } - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { - if (var0.objectId >= 0) { - var2 = var0.objectId; - var3 = var0.field1096; - var4 = class245.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method3213(var3); - if (!var1) { - continue; - } - } - - ServerPacket.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1095, var0.field1096); - var0.remove(); + } else { + if (var7 != -1) { // L: 9677 + Client.field594[var7] = true; } else { - if (var0.delay > 0) { - --var0.delay; - } - - 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.field1104; - var4 = class245.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method3213(var3); - if (!var1) { - continue; - } - } - - ServerPacket.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1104); - var0.delay = -1; - if (var0.id == var0.objectId && var0.objectId == -1) { - var0.remove(); - } else if (var0.id == var0.objectId && var0.field1095 == var0.orientation && var0.field1096 == var0.field1104) { - var0.remove(); - } + for (int var8 = 0; var8 < 100; ++var8) { // L: 9679 + Client.field594[var8] = true; } } + } - - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(Ljt;III)V", - garbageValue = "2115549302" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - - } + } // L: 9681 9689 } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index dc978c390d..6922a0f395 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,308 +1,296 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jy") @Implements("Huffman") public class Huffman { - @ObfuscatedName("m") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("s") - static int[][][] field3203; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 720432763 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("masks") int[] masks; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("bits") byte[] bits; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("keys") int[] keys; public Huffman(byte[] var1) { - 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; + 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 - 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; + 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 int var9; int var10; int var11; int var12; - if ((var8 & var7) != 0) { + if ((var8 & var7) != 0) { // L: 22 var9 = var3[var6 - 1]; } else { - var9 = var8 | var7; + var9 = var8 | var7; // L: 24 - for (var10 = var6 - 1; var10 >= 1; --var10) { - var11 = var3[var10]; - if (var11 != var8) { + for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 + var11 = var3[var10]; // L: 26 + if (var11 != var8) { // L: 27 break; } - var12 = 1 << 32 - var10; - if ((var11 & var12) != 0) { - var3[var10] = var3[var10 - 1]; + var12 = 1 << 32 - var10; // L: 28 + if ((var11 & var12) != 0) { // L: 29 + var3[var10] = var3[var10 - 1]; // L: 30 break; } - var3[var10] = var11 | var12; + var3[var10] = var11 | var12; // L: 33 } } - var3[var6] = var9; + var3[var6] = var9; // L: 38 - for (var10 = var6 + 1; var10 <= 32; ++var10) { - if (var8 == var3[var10]) { + for (var10 = var6 + 1; var10 <= 32; ++var10) { // L: 39 + if (var8 == var3[var10]) { // L: 40 var3[var10] = var9; } } - var10 = 0; + var10 = 0; // L: 42 - for (var11 = 0; var11 < var6; ++var11) { - var12 = Integer.MIN_VALUE >>> var11; - if ((var8 & var12) != 0) { - if (this.keys[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 this.keys[var10] = var4; } - var10 = this.keys[var10]; + var10 = this.keys[var10]; // L: 47 } else { - ++var10; + ++var10; // L: 49 } - if (var10 >= this.keys.length) { - int[] var13 = new int[this.keys.length * 2]; + if (var10 >= this.keys.length) { // L: 50 + int[] var13 = new int[this.keys.length * 2]; // L: 51 - for (int var14 = 0; var14 < this.keys.length; ++var14) { + for (int var14 = 0; var14 < this.keys.length; ++var14) { // L: 52 var13[var14] = this.keys[var14]; } - this.keys = var13; + this.keys = var13; // L: 53 } - var12 >>>= 1; + var12 >>>= 1; // L: 55 } - this.keys[var10] = ~var5; - if (var10 >= var4) { + this.keys[var10] = ~var5; // L: 57 + if (var10 >= var4) { // L: 58 var4 = var10 + 1; } } } - } + } // L: 60 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BII[BII)I", - garbageValue = "-1770389833" + descriptor = "([BII[BIB)I", + garbageValue = "-41" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { - int var6 = 0; - int var7 = var5 << 3; + int var6 = 0; // L: 63 + int var7 = var5 << 3; // L: 64 - for (var3 += var2; var2 < var3; ++var2) { - int var8 = var1[var2] & 255; - int var9 = this.masks[var8]; - byte var10 = this.bits[var8]; - if (var10 == 0) { + 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 throw new RuntimeException("" + var8); } - 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); + 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 } } } } - var7 += var10; + var7 += var10; // L: 95 } - return (var7 + 7 >> 3) - var5; + return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "1079719543" + garbageValue = "133362978" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { - if (var5 == 0) { + if (var5 == 0) { // L: 101 return 0; } else { - int var6 = 0; - var5 += var4; + int var6 = 0; // L: 102 + var5 += var4; // L: 103 int var7 = var2; while (true) { - byte var8 = var1[var7]; - if (var8 < 0) { + byte var8 = var1[var7]; // L: 106 + if (var8 < 0) { // L: 108 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 109 } int var9; - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 110 + var3[var4++] = (byte)(~var9); // L: 111 + if (var4 >= var5) { // L: 112 break; } - var6 = 0; + var6 = 0; // L: 113 } - if ((var8 & 64) != 0) { + if ((var8 & 64) != 0) { // L: 115 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 116 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 117 + var3[var4++] = (byte)(~var9); // L: 118 + if (var4 >= var5) { // L: 119 break; } - var6 = 0; + var6 = 0; // L: 120 } - if ((var8 & 32) != 0) { + if ((var8 & 32) != 0) { // L: 122 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 123 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 124 + var3[var4++] = (byte)(~var9); // L: 125 + if (var4 >= var5) { // L: 126 break; } - var6 = 0; + var6 = 0; // L: 127 } - if ((var8 & 16) != 0) { + if ((var8 & 16) != 0) { // L: 129 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 130 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 131 + var3[var4++] = (byte)(~var9); // L: 132 + if (var4 >= var5) { // L: 133 break; } - var6 = 0; + var6 = 0; // L: 134 } - if ((var8 & 8) != 0) { + if ((var8 & 8) != 0) { // L: 136 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 137 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 138 + var3[var4++] = (byte)(~var9); // L: 139 + if (var4 >= var5) { // L: 140 break; } - var6 = 0; + var6 = 0; // L: 141 } - if ((var8 & 4) != 0) { + if ((var8 & 4) != 0) { // L: 143 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 144 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 145 + var3[var4++] = (byte)(~var9); // L: 146 + if (var4 >= var5) { // L: 147 break; } - var6 = 0; + var6 = 0; // L: 148 } - if ((var8 & 2) != 0) { + if ((var8 & 2) != 0) { // L: 150 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 151 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 152 + var3[var4++] = (byte)(~var9); // L: 153 + if (var4 >= var5) { // L: 154 break; } - var6 = 0; + var6 = 0; // L: 155 } if ((var8 & 1) != 0) { - var6 = this.keys[var6]; + var6 = this.keys[var6]; // L: 157 } else { - ++var6; + ++var6; // L: 158 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 159 + var3[var4++] = (byte)(~var9); // L: 160 + if (var4 >= var5) { // L: 161 break; } - var6 = 0; + var6 = 0; // L: 162 } - ++var7; + ++var7; // L: 105 } - return var7 + 1 - var2; + return var7 + 1 - var2; // L: 165 } } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 3add063328..9a24286b30 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,104 +3,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lr") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lny;)V" + descriptor = "(Lni;)V" ) public IgnoreList(LoginType var1) { - super(400); - this.loginType = var1; - } + super(400); // L: 13 + this.loginType = var1; // L: 14 + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Llu;", - garbageValue = "396333118" + descriptor = "(I)Lla;", + garbageValue = "-450730044" ) @Export("newInstance") User newInstance() { - return new Ignored(); + return new Ignored(); // L: 18 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)[Llu;", - garbageValue = "1129798936" + descriptor = "(IB)[Lla;", + garbageValue = "91" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; + return new Ignored[var1]; // L: 22 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "2059632689" + descriptor = "(Lop;IB)V", + garbageValue = "-32" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - 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 && var7 != var8) { - if (var7 != null) { - this.remove(var8); + if (var1.offset < var2) { // L: 26 + int var3 = var1.readUnsignedByte(); // L: 27 + boolean var4 = (var3 & 1) == 1; // L: 28 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29 + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 30 + var1.readStringCp1252NullTerminated(); // L: 31 + if (var5 != null && var5.hasCleanName()) { // L: 32 + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 33 + if (var4) { // L: 34 + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 35 + if (var8 != null && var8 != var7) { // L: 36 + if (var7 != null) { // L: 37 + this.remove(var8); // L: 38 } else { - var7 = var8; + var7 = var8; // L: 41 } } } - if (var7 != null) { - this.changeName(var7, var5, var6); + if (var7 != null) { // L: 45 + this.changeName(var7, var5, var6); // L: 46 continue; } - if (this.getSize() < 400) { - int var9 = this.getSize(); - var7 = (Ignored)this.addLast(var5, var6); - var7.id = var9; + if (this.getSize() < 400) { // L: 48 + int var9 = this.getSize(); // L: 49 + var7 = (Ignored)this.addLast(var5, var6); // L: 50 + var7.id = var9; // L: 51 } continue; } - throw new IllegalStateException(); + throw new IllegalStateException(); // L: 54 } - return; + return; // L: 55 } } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "618832095" - ) - static int method5946(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; - } - - var3 = ~var3; - return var3; - } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index c71ae99e50..7980b8b260 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,48 +4,59 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mm") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lme;" - ) - static Bounds field3969; - @ObfuscatedName("bd") - @Export("otp") - static String otp; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1208503279 + intValue = -781927569 ) @Export("id") int id; Ignored() { - } + } // L: 6 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmo;I)I", - garbageValue = "1729622870" + descriptor = "(Lmm;I)I", + garbageValue = "867220542" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { - return this.id - var1.id; + return this.id - var1.id; // L: 9 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Llu;B)I", - garbageValue = "-81" + descriptor = "(Lla;I)I", + garbageValue = "-1073614160" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareTo_ignored((Ignored)var1); + return this.compareTo_ignored((Ignored)var1); // L: 13 } public int compareTo(Object var1) { - return this.compareTo_ignored((Ignored)var1); + return this.compareTo_ignored((Ignored)var1); // L: 17 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Lom;", + garbageValue = "1673389223" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4378, FillMode.field4377, FillMode.SOLID}; // L: 15 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1749194740" + ) + static final boolean method6212(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 28 } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 13c5287d4f..e58b68cf75 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,276 +2,276 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oz") +@ObfuscatedName("oe") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("pixels") public byte[] pixels; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("palette") public int[] palette; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("subWidth") public int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("subHeight") public int subHeight; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("xOffset") public int xOffset; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("yOffset") public int yOffset; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("width") public int width; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("height") public int height; IndexedSprite() { - } + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { - byte[] var1 = new byte[this.width * this.height]; - int var2 = 0; + 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 - 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++]; + 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 } } - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; + 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 } - } + } // L: 31 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.palette.length; ++var4) { - int var5 = this.palette[var4] >> 16 & 255; - var5 += var1; - if (var5 < 0) { + 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 var5 = 0; - } else if (var5 > 255) { + } else if (var5 > 255) { // L: 38 var5 = 255; } - int var6 = this.palette[var4] >> 8 & 255; - var6 += var2; - if (var6 < 0) { + int var6 = this.palette[var4] >> 8 & 255; // L: 39 + var6 += var2; // L: 40 + if (var6 < 0) { // L: 41 var6 = 0; - } else if (var6 > 255) { + } else if (var6 > 255) { // L: 42 var6 = 255; } - int var7 = this.palette[var4] & 255; - var7 += var3; - if (var7 < 0) { + int var7 = this.palette[var4] & 255; // L: 43 + var7 += var3; // L: 44 + if (var7 < 0) { // L: 45 var7 = 0; - } else if (var7 > 255) { + } else if (var7 > 255) { // L: 46 var7 = 255; } - this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); + this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); // L: 47 } - } + } // L: 49 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + 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 int var9; - 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 (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 (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 67 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (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 (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= 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 > 0 && var5 > 0) { - IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 83 + IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); // L: 84 } - } + } // L: 85 - @ObfuscatedName("m") - public void method7274(int var1, int var2, int var3, int var4) { - 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; + @ObfuscatedName("o") + public void method7362(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 var13; - if (this.xOffset > 0) { - var13 = (var11 + (this.xOffset << 16) - 1) / var11; - var1 += var13; - var7 += var13 * var11 - (this.xOffset << 16); + 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.yOffset > 0) { - var13 = (var12 + (this.yOffset << 16) - 1) / var12; - var2 += var13; - var8 += var13 * var12 - (this.yOffset << 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 (var5 < var9) { + if (var5 < var9) { // L: 134 var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { + if (var6 < var10) { // L: 135 var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 136 + int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 137 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 138 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var15; - var13 += var15 * Rasterizer2D.Rasterizer2D_width; - var8 += var12 * 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var15; - var14 += 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var15; - var13 += var15; - var7 += var11 * 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 } - IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); - } + IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 + } // L: 158 - @ObfuscatedName("j") + @ObfuscatedName("a") @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); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 88 + var5 = -(var5 & 3); // L: 89 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 90 int var11; byte var12; - for (var11 = var9; var11 < 0; ++var11) { - var12 = var1[var3++]; + for (var11 = var9; var11 < 0; ++var11) { // L: 91 + var12 = var1[var3++]; // L: 92 if (var12 != 0) { - var0[var4++] = var2[var12 & 255]; + var0[var4++] = var2[var12 & 255]; // L: 93 } else { - ++var4; + ++var4; // L: 94 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 95 + if (var12 != 0) { // L: 96 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 97 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 98 + if (var12 != 0) { // L: 99 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 100 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 101 + if (var12 != 0) { // L: 102 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 103 } } - for (var11 = var5; var11 < 0; ++var11) { - var12 = var1[var3++]; - if (var12 != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 105 + var12 = var1[var3++]; // L: 106 + if (var12 != 0) { // L: 107 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 108 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 110 + var3 += var8; // L: 111 } - } + } // L: 113 - @ObfuscatedName("k") + @ObfuscatedName("g") @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; + int var12 = var3; // L: 161 - for (int var13 = -var8; var13 < 0; ++var13) { - int var14 = var11 * (var4 >> 16); + for (int var13 = -var8; var13 < 0; ++var13) { // L: 162 + int var14 = var11 * (var4 >> 16); // L: 163 - for (int var15 = -var7; var15 < 0; ++var15) { - byte var16 = var1[(var3 >> 16) + var14]; - if (var16 != 0) { + for (int var15 = -var7; var15 < 0; ++var15) { // L: 164 + byte var16 = var1[(var3 >> 16) + var14]; // L: 165 + if (var16 != 0) { // L: 166 var0[var5++] = var2[var16 & 255]; } else { - ++var5; + ++var5; // L: 167 } - var3 += var9; + var3 += var9; // L: 168 } - var4 += var10; - var3 = var12; - var5 += var6; + var4 += var10; // L: 170 + var3 = var12; // L: 171 + var5 += var6; // L: 172 } - } + } // L: 174 } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 4f0cf24304..eb9164a733 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,186 +4,186 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bg") @Implements("Instrument") public class Instrument { - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("delayTime") int delayTime; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("delayDecay") int delayDecay; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lay;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("duration") int duration; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("offset") int offset; static { - Instrument_noise = new int[32768]; - Random var0 = new Random(0L); + Instrument_noise = new int[32768]; // L: 31 + Random var0 = new Random(0L); // L: 32 int var1; - for (var1 = 0; var1 < 32768; ++var1) { - Instrument_noise[var1] = (var0.nextInt() & 2) - 1; + for (var1 = 0; var1 < 32768; ++var1) { // L: 33 + Instrument_noise[var1] = (var0.nextInt() & 2) - 1; // L: 34 } - Instrument_sine = new int[32768]; + Instrument_sine = new int[32768]; // L: 36 - for (var1 = 0; var1 < 32768; ++var1) { - Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); + for (var1 = 0; var1 < 32768; ++var1) { // L: 37 + Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); // L: 38 } - 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_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() { - 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; - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class321.clearIntArray(Instrument_samples, 0, var1); - if (var2 < 10) { + class321.clearIntArray(Instrument_samples, 0, var1); // L: 53 + if (var2 < 10) { // L: 54 return Instrument_samples; } else { - double var3 = (double)var1 / ((double)var2 + 0.0D); - this.pitch.reset(); - this.volume.reset(); - int var5 = 0; - int var6 = 0; - int var7 = 0; - if (this.pitchModifier != null) { - 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); + 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 } - 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 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 var11; - for (var11 = 0; var11 < 5; ++var11) { - if (this.oscillatorVolume[var11] != 0) { - Instrument_phases[var11] = 0; - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); + 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 } } @@ -192,30 +192,30 @@ public class Instrument { int var14; int var15; int[] var10000; - for (var11 = 0; var11 < var1; ++var11) { - var12 = this.pitch.doStep(var1); - var13 = this.volume.doStep(var1); - if (this.pitchModifier != null) { - var14 = this.pitchModifier.doStep(var1); - var15 = this.pitchModifierAmplitude.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; - var7 = var7 + var6 + (var14 * var5 >> 16); + 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 } - 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); + 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 } - for (var14 = 0; var14 < 5; ++var14) { - if (this.oscillatorVolume[var14] != 0) { - var15 = Instrument_delays[var14] + var11; - if (var15 < var1) { - var10000 = Instrument_samples; + 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 var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - var10000 = Instrument_phases; + var10000 = Instrument_phases; // L: 104 var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } @@ -223,204 +223,204 @@ public class Instrument { } int var16; - if (this.release != null) { - this.release.reset(); - this.attack.reset(); - var11 = 0; - boolean var19 = false; - boolean var20 = true; + 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 - for (var14 = 0; var14 < var1; ++var14) { - var15 = this.release.doStep(var1); - var16 = this.attack.doStep(var1); - if (var20) { + 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 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; + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; // L: 118 } - var11 += 256; + var11 += 256; // L: 119 if (var11 >= var12) { - var11 = 0; - var20 = !var20; + var11 = 0; // L: 120 + var20 = !var20; // L: 121 } - if (var20) { + if (var20) { // L: 123 Instrument_samples[var14] = 0; } } } - if (this.delayTime > 0 && this.delayDecay > 0) { - var11 = (int)((double)this.delayTime * var3); + if (this.delayTime > 0 && this.delayDecay > 0) { // L: 126 + var11 = (int)((double)this.delayTime * var3); // L: 127 - for (var12 = var11; var12 < var1; ++var12) { + for (var12 = var11; var12 < var1; ++var12) { // L: 128 var10000 = Instrument_samples; var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { - this.filterEnvelope.reset(); - var11 = this.filterEnvelope.doStep(var1 + 1); - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - if (var1 >= var12 + var13) { - var14 = 0; - var15 = var13; - if (var13 > var1 - var12) { + 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 var15 = var1 - var12; } int var17; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 140 - for (var17 = 0; var17 < var12; ++var17) { + for (var17 = 0; var17 < var12; ++var17) { // L: 141 var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); } - for (var17 = 0; var17 < var14; ++var17) { + for (var17 = 0; var17 < var14; ++var17) { // L: 142 var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); } - Instrument_samples[var14] = var16; - var11 = this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var16; // L: 143 + var11 = this.filterEnvelope.doStep(var1 + 1); // L: 144 + ++var14; // L: 139 } - var15 = 128; + var15 = 128; // L: 147 while (true) { - if (var15 > var1 - var12) { + if (var15 > var1 - var12) { // L: 149 var15 = var1 - var12; } int var18; while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 151 - for (var18 = 0; var18 < var12; ++var18) { + for (var18 = 0; var18 < var12; ++var18) { // L: 152 var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { + for (var18 = 0; var18 < var13; ++var18) { // L: 153 var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; - var11 = this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var17; // L: 154 + var11 = this.filterEnvelope.doStep(var1 + 1); // L: 155 + ++var14; // L: 150 } - if (var14 >= var1 - var12) { + if (var14 >= var1 - var12) { // L: 157 while (var14 < var1) { - var17 = 0; + var17 = 0; // L: 163 - for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { // L: 164 var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { + for (var18 = 0; var18 < var13; ++var18) { // L: 165 var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; - this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var17; // L: 166 + this.filterEnvelope.doStep(var1 + 1); // L: 167 + ++var14; // L: 162 } break; } - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - var15 += 128; + 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 } } } - for (var11 = 0; var11 < var1; ++var11) { - if (Instrument_samples[var11] < -32768) { + for (var11 = 0; var11 < var1; ++var11) { // L: 171 + if (Instrument_samples[var11] < -32768) { // L: 172 Instrument_samples[var11] = -32768; } - if (Instrument_samples[var11] > 32767) { + if (Instrument_samples[var11] > 32767) { // L: 173 Instrument_samples[var11] = 32767; } } - return Instrument_samples; + return Instrument_samples; // L: 175 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { - if (var3 == 1) { - return (var1 & 32767) < 16384 ? var2 : -var2; - } else if (var3 == 2) { + if (var3 == 1) { // L: 179 + return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 + } else if (var3 == 2) { // L: 183 return Instrument_sine[var1 & 32767] * var2 >> 14; - } else if (var3 == 3) { + } else if (var3 == 3) { // L: 184 return (var2 * (var1 & 32767) >> 14) - var2; } else { - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; // L: 185 186 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) @Export("decode") final void decode(Buffer var1) { - 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); + 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 } - 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: 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.release = new SoundEnvelope(); - this.release.decode(var1); - this.attack = new SoundEnvelope(); - this.attack.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 } - for (int var3 = 0; var3 < 10; ++var3) { - int var4 = var1.readUShortSmart(); - if (var4 == 0) { + for (int var3 = 0; var3 < 10; ++var3) { // L: 218 + int var4 = var1.readUShortSmart(); // L: 219 + if (var4 == 0) { // L: 220 break; } - this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = var1.readShortSmart(); - this.oscillatorDelays[var3] = var1.readUShortSmart(); + this.oscillatorVolume[var3] = var4; // L: 221 + this.oscillatorPitch[var3] = var1.readShortSmart(); // L: 222 + this.oscillatorDelays[var3] = var1.readUShortSmart(); // L: 223 } - 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.method1029(var1, this.filterEnvelope); - } + 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.method1082(var1, this.filterEnvelope); // L: 231 + } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 95722601b5..9345f5f0be 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,62 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pz") +@ObfuscatedName("pp") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("array") int[] array; public IntHashTable(int[] var1) { int var2; - for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { + for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { // L: 7 8 } - this.array = new int[var2 + var2]; + this.array = new int[var2 + var2]; // L: 9 int var3; - for (var3 = 0; var3 < var2 + var2; ++var3) { + for (var3 = 0; var3 < var2 + var2; ++var3) { // L: 10 this.array[var3] = -1; } int var4; - 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) { + 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 } - this.array[var4 + var4] = var1[var3]; + this.array[var4 + var4] = var1[var3]; // L: 14 } - } + } // L: 17 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "290771038" + descriptor = "(IB)I", + garbageValue = "4" ) @Export("get") public int get(int var1) { - int var2 = (this.array.length >> 1) - 1; - int var3 = var1 & var2; + int var2 = (this.array.length >> 1) - 1; // L: 20 + int var3 = var1 & var2; // L: 21 while (true) { - int var4 = this.array[var3 + var3 + 1]; - if (var4 == -1) { + int var4 = this.array[var3 + var3 + 1]; // L: 23 + if (var4 == -1) { // L: 24 return -1; } - if (this.array[var3 + var3] == var1) { + if (this.array[var3 + var3] == var1) { // L: 25 return var4; } - var3 = var3 + 1 & var2; + var3 = var3 + 1 & var2; // L: 26 } } } diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 4b5d24c4ab..c3e0f2d706 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nh") +@ObfuscatedName("nl") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("integer") public int integer; public IntegerNode(int var1) { - this.integer = var1; - } + this.integer = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index a0ccf5697d..16f0e27462 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -2,32 +2,99 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ct") +@ObfuscatedName("cq") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1049633095 + intValue = -323406049 ) @Export("group") int group; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -170109933 + intValue = -951908341 ) @Export("type") int type; - @ObfuscatedName("f") - boolean field1031; + @ObfuscatedName("s") + boolean field1011; InterfaceParent() { - this.field1031 = false; + this.field1011 = false; // L: 8 + } // L: 10 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILbp;ZS)I", + garbageValue = "16109" + ) + static int method2079(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1224 + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1241 + var7 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1242 + var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1243 + if (var4 >= 1 && var4 <= 10) { // L: 1244 + class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); // L: 1247 + Interpreter.field797.add(var8); // L: 1248 + return 1; // L: 1249 + } else { + throw new RuntimeException(); // L: 1245 + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1251 + class14.Interpreter_intStackSize -= 3; // L: 1252 + int var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1253 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1254 + int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 1255 + if (var5 >= 1 && var5 <= 10) { // L: 1256 + class92 var6 = new class92(var5, var3, var4, UserComparator9.getWidget(var3).itemId); // L: 1259 + Interpreter.field797.add(var6); // L: 1260 + return 1; // L: 1261 + } else { + throw new RuntimeException(); // L: 1257 + } + } else { + return 2; // L: 1263 + } + } else if (Interpreter.field798 >= 10) { // L: 1225 + throw new RuntimeException(); // L: 1226 + } else { + if (var0 >= 2000) { // L: 1229 + var7 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1230 + } else { + var7 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1232 + } + + if (var7.onResize == null) { // L: 1233 + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); // L: 1234 + var9.widget = var7; // L: 1235 + var9.args = var7.onResize; // L: 1236 + var9.field1024 = Interpreter.field798 + 1; // L: 1237 + Client.scriptEvents.addFirst(var9); // L: 1238 + return 1; // L: 1239 + } + } } - @ObfuscatedName("e") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1428422935" + ) + static boolean method2080(int var0) { + for (int var1 = 0; var1 < Client.field695; ++var1) { // L: 11114 + if (Client.field697[var1] == var0) { // L: 11115 + return true; + } + } + + return false; // L: 11117 } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 1fd64e0ad4..04542dec24 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -5,117 +5,113 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bj") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("Interpreter_intStack") static int[] Interpreter_intStack; @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -784806353 - ) - static int field829; - @ObfuscatedName("w") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1089183027 + intValue = 137218349 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lbj;" + descriptor = "[Lbt;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("n") - static boolean field828; - @ObfuscatedName("u") - static boolean field832; - @ObfuscatedName("d") - static ArrayList field830; - @ObfuscatedName("ab") + @ObfuscatedName("f") + static boolean field795; + @ObfuscatedName("h") + static boolean field791; + @ObfuscatedName("v") + static ArrayList field797; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1390220385 + intValue = 519063965 ) - static int field818; - @ObfuscatedName("ah") - static final double field826; - @ObfuscatedName("ez") + static int field798; + @ObfuscatedName("am") + static final double field801; + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lci;" ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "Llt;" - ) - @Export("fontBold12") - static Font fontBold12; + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; static { - 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"}; - field828 = false; - field832 = false; - field830 = new ArrayList(); - field818 = 0; - field826 = Math.log(2.0D); + 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 + field795 = false; // L: 96 + field791 = false; // L: 97 + field797 = new ArrayList(); // L: 98 + field798 = 0; // L: 99 + field801 = Math.log(2.0D); // L: 103 } - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2021156049" + descriptor = "(Ljf;IIIB)V", + garbageValue = "124" ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "525192996" - ) - static int method1868(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class6.method43(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = PacketBufferNode.method4654(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Messages.method2350(var3) ? 1 : 0; - return 1; + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3128 == null) { // L: 999 + throw new RuntimeException(); // L: 1000 } else { - return 2; + var0.field3128[var1] = var2; // L: 1002 + var0.field3129[var1] = var3; // L: 1003 } - } + } // L: 1004 + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(Lfm;IIII)V", + garbageValue = "-228411245" + ) + static void method1872(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class408.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4049 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 4050 + int var4 = var0.soundEffects[var1]; // L: 4051 + if (var4 != 0) { // L: 4052 + int var5 = var4 >> 8; // L: 4053 + int var6 = var4 >> 4 & 7; // L: 4054 + int var7 = var4 & 15; // L: 4055 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 4056 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 4057 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 4058 + Client.soundEffects[Client.soundEffectCount] = null; // L: 4059 + int var8 = (var2 - 64) / 128; // L: 4060 + int var9 = (var3 - 64) / 128; // L: 4061 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 4062 + ++Client.soundEffectCount; // L: 4063 + } + } + } + } // L: 4064 } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index e78262f3fb..1de99d9eb7 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -3,41 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ey") +@ObfuscatedName("ei") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("q") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 112502767 + intValue = -1330627969 ) @Export("size") public int size; static { - InvDefinition_cached = new EvictingDualNodeHashTable(64); + InvDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } InvDefinition() { - this.size = 0; - } + this.size = 0; // L: 12 + } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "58373991" + descriptor = "(Lop;I)V", + garbageValue = "2084245360" ) @Export("decode") void decode(Buffer var1) { @@ -51,31 +58,150 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "27" + descriptor = "(Lop;II)V", + garbageValue = "712504177" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { + if (var2 == 2) { // L: 35 this.size = var1.readUnsignedShort(); } + } // L: 37 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Lfu;", + garbageValue = "26" + ) + public static FloorOverlayDefinition method2987(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 31 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "73" + descriptor = "(IB)Lbp;", + garbageValue = "92" ) - public static int method2881(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; + } else { + byte[] var2 = class14.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = class87.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1968764473" + ) + static void method2983() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 50 + } // L: 51 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "-1702498175" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3881) { // L: 116 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3882) { // L: 120 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121 + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3883) { // L: 124 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125 + } else if (var0.length == 30000 && ByteArrayPool.field3891 < ByteArrayPool.field3884) { // L: 128 + ByteArrayPool.field3888[++ByteArrayPool.field3891 - 1] = var0; // L: 129 + } else { + if (class260.ByteArrayPool_arrays != null) { // L: 132 + for (int var1 = 0; var1 < class176.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133 + if (var0.length == class176.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < class260.ByteArrayPool_arrays[var1].length) { // L: 134 + class260.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135 + return; // L: 136 + } + } + } + + } + } // L: 118 122 126 130 140 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-1900021864" + ) + static int method2982(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3582 + class14.Interpreter_intStackSize -= 2; // L: 3583 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3584 + int var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3585 + if (!Client.isCameraLocked) { // L: 3586 + Client.camAngleX = var3; // L: 3587 + Client.camAngleY = var4; // L: 3588 + } + + return 1; // L: 3590 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3592 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3593 + return 1; // L: 3594 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3596 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3597 + return 1; // L: 3598 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3600 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3601 + if (var3 < 0) { // L: 3602 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3603 + return 1; // L: 3604 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3606 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3607 + return 1; // L: 3608 + } else { + return 2; // L: 3610 + } + } + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "-2065208815" + ) + public static void method2986(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2736, Client.packetWriter.isaacCipher); // L: 12003 + var4.packetBuffer.method6962(var0); // L: 12004 + var4.packetBuffer.method6962(var1); // L: 12005 + var4.packetBuffer.method6993(var2); // L: 12006 + var4.packetBuffer.writeIntME(var3 ? Client.field552 * -2052313535 * -1777671743 : 0); // L: 12007 + Client.packetWriter.addNode(var4); // L: 12008 + } // L: 12009 } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index ded4e9ab16..572e58aad0 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,241 +4,241 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pv") +@ObfuscatedName("pw") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1898729061 + intValue = 1888133689 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("results") int[] results; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("mm") int[] mm; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 521683111 + intValue = -382351509 ) @Export("aa") int aa; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 245385603 + intValue = 674154351 ) @Export("bb") int bb; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -80313703 + intValue = -303333613 ) @Export("cc") int cc; public IsaacCipher(int[] var1) { - this.mm = new int[256]; - this.results = new int[256]; + this.mm = new int[256]; // L: 15 + this.results = new int[256]; // L: 16 - for (int var2 = 0; var2 < var1.length; ++var2) { - this.results[var2] = var1[var2]; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 17 + this.results[var2] = var1[var2]; // L: 18 } - this.method7435(); - } + this.method7542(); // L: 20 + } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-84" + descriptor = "(I)I", + garbageValue = "-2045035341" ) @Export("nextInt") public final int nextInt() { - if (this.valuesRemaining == 0) { - this.generateMoreResults(); - this.valuesRemaining = 256; + if (this.valuesRemaining == 0) { // L: 24 + this.generateMoreResults(); // L: 25 + this.valuesRemaining = 256; // L: 26 } - return this.results[--this.valuesRemaining]; + return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1675235951" + garbageValue = "1844018191" ) - public final int method7440() { - if (this.valuesRemaining == 0) { - this.generateMoreResults(); - this.valuesRemaining = 256; + public final int method7540() { + if (this.valuesRemaining == 0) { // L: 32 + this.generateMoreResults(); // L: 33 + this.valuesRemaining = 256; // L: 34 } - return this.results[this.valuesRemaining - 1]; + return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "75" + descriptor = "(I)V", + garbageValue = "935170894" ) @Export("generateMoreResults") final void generateMoreResults() { - this.bb += ++this.cc; + this.bb += ++this.cc; // L: 43 - for (int var1 = 0; var1 < 256; ++var1) { - int var2 = this.mm[var1]; - if ((var1 & 2) == 0) { - if ((var1 & 1) == 0) { + 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 this.aa ^= this.aa << 13; } else { - this.aa ^= this.aa >>> 6; + this.aa ^= this.aa >>> 6; // L: 48 } - } else if ((var1 & 1) == 0) { + } else if ((var1 & 1) == 0) { // L: 51 this.aa ^= this.aa << 2; } else { - this.aa ^= this.aa >>> 16; + this.aa ^= this.aa >>> 16; // L: 52 } - this.aa += this.mm[var1 + 128 & 255]; + this.aa += this.mm[var1 + 128 & 255]; // L: 54 int var3; - 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; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55 + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 } - } + } // L: 58 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2000528690" + garbageValue = "-448828417" ) - final void method7435() { - int var9 = -1640531527; - int var8 = -1640531527; - int var7 = -1640531527; - int var6 = -1640531527; - int var5 = -1640531527; - int var4 = -1640531527; - int var3 = -1640531527; - int var2 = -1640531527; + final void method7542() { + 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 var1; - 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 < 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 < 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: 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.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; + 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 } - this.generateMoreResults(); - this.valuesRemaining = 256; - } + this.generateMoreResults(); // L: 188 + this.valuesRemaining = 256; // L: 189 + } // L: 190 } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 9ac1c856a6..2fefc85073 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -1,962 +1,1019 @@ +import java.util.Collections; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("ff") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("a") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ItemDefinition_cached") static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ItemDefinition_cachedModels") static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Llt;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("v") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = -1517930851 + intValue = -1826630813 + ) + static int field1931; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1753723685 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 516458913 + intValue = 1325108261 ) @Export("model") int model; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -917161185 + intValue = 1547329069 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -452236997 + intValue = -644956173 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 907897891 + intValue = -212256273 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1537793613 + intValue = -1823149965 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 616169855 + intValue = 494142303 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1543674565 + intValue = 1457656139 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 877270447 + intValue = 912207585 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -400854117 + intValue = -1708222131 ) @Export("price") public int price; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -321032365 + intValue = 185222303 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1238423501 + intValue = 612677957 ) @Export("maleModel") int maleModel; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1024797737 + intValue = -1733428819 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1108751253 + intValue = -1445773573 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1140431421 + intValue = 2098654815 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1843085613 + intValue = 535363813 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1010041579 + intValue = -1120928283 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1324140471 + intValue = -1786291667 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -2021117977 + intValue = 1983865871 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 662291345 + intValue = 1571654147 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 185340391 + intValue = -1283309971 ) @Export("maleHeadModel2") int maleHeadModel2; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2058201645 + intValue = 185358531 ) @Export("femaleHeadModel") int femaleHeadModel; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1136742097 + intValue = -1890466531 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("aj") + @ObfuscatedName("au") @Export("countobj") int[] countobj; - @ObfuscatedName("am") + @ObfuscatedName("aj") @Export("countco") int[] countco; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1247011587 + intValue = 777424459 ) @Export("note") public int note; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 441083277 + intValue = 1728558393 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ae") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -762817075 + intValue = 394985009 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -962491483 + intValue = -1569909587 ) @Export("resizeY") int resizeY; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1883162483 + intValue = -1225424617 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1533114405 + intValue = 1533148773 ) @Export("ambient") public int ambient; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 912582123 + intValue = -1062134429 ) @Export("contrast") public int contrast; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1758157485 + intValue = 693327587 ) @Export("team") public int team; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bj") + @ObfuscatedName("bt") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -430729961 + intValue = -404111403 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bx") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 284240827 + intValue = 1171307527 ) @Export("notedId") int notedId; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 676744535 + intValue = -593718331 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 754938043 + intValue = -120370631 ) @Export("placeholderTemplate") public int placeholderTemplate; static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); - ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); + ItemDefinition_cached = new EvictingDualNodeHashTable(64); // L: 28 + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 29 + ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30 } ItemComposition() { - this.name = "null"; - this.zoom2d = 2000; - this.xan2d = 0; - this.yan2d = 0; - this.zan2d = 0; + 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; 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.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 this.shiftClickIndex = -2; this.maleModel = -1; this.maleModel1 = -1; this.maleOffset = 0; this.femaleModel = -1; - this.femaleModel1 = -1; + this.femaleModel1 = -1; // L: 56 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; - } + 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 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" + descriptor = "(I)V", + garbageValue = "-2124402734" ) @Export("post") void post() { - } + } // L: 121 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "-30" + descriptor = "(Lop;I)V", + garbageValue = "-894637983" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 125 + if (var2 == 0) { // L: 126 + return; // L: 129 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 127 } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;IS)V", - garbageValue = "13949" + descriptor = "(Lop;II)V", + garbageValue = "257539679" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 132 this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 133 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 134 this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 135 this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 136 this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { - this.offsetX2d = var1.readUnsignedShort(); - if (this.offsetX2d > 32767) { + } else if (var2 == 7) { // L: 137 + this.offsetX2d = var1.readUnsignedShort(); // L: 138 + if (this.offsetX2d > 32767) { // L: 139 this.offsetX2d -= 65536; } - } else if (var2 == 8) { - this.offsetY2d = var1.readUnsignedShort(); - if (this.offsetY2d > 32767) { + } else if (var2 == 8) { // L: 141 + this.offsetY2d = var1.readUnsignedShort(); // L: 142 + if (this.offsetY2d > 32767) { // L: 143 this.offsetY2d -= 65536; } - } else if (var2 == 9) { - var1.readStringCp1252NullTerminated(); - } else if (var2 == 11) { + } else if (var2 == 9) { // L: 145 + var1.readStringCp1252NullTerminated(); // L: 146 + } else if (var2 == 11) { // L: 148 this.isStackable = 1; - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 149 this.price = var1.readInt(); - } else if (var2 == 16) { + } else if (var2 == 16) { // L: 150 this.isMembersOnly = true; - } else if (var2 == 23) { - this.maleModel = var1.readUnsignedShort(); - this.maleOffset = var1.readUnsignedByte(); - } else if (var2 == 24) { + } else if (var2 == 23) { // L: 151 + this.maleModel = var1.readUnsignedShort(); // L: 152 + this.maleOffset = var1.readUnsignedByte(); // L: 153 + } else if (var2 == 24) { // L: 155 this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { - this.femaleModel = var1.readUnsignedShort(); - this.femaleOffset = var1.readUnsignedByte(); - } else if (var2 == 26) { + } else if (var2 == 25) { // L: 156 + this.femaleModel = var1.readUnsignedShort(); // L: 157 + this.femaleOffset = var1.readUnsignedByte(); // L: 158 + } else if (var2 == 26) { // L: 160 this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { + } else if (var2 >= 30 && var2 < 35) { // L: 161 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 162 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 163 this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { + } else if (var2 >= 35 && var2 < 40) { // L: 165 this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); } else { int var3; int var4; - if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + if (var2 == 40) { // L: 166 + var3 = var1.readUnsignedByte(); // L: 167 + this.recolorFrom = new short[var3]; // L: 168 + this.recolorTo = new short[var3]; // L: 169 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 170 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 175 + var3 = var1.readUnsignedByte(); // L: 176 + this.retextureFrom = new short[var3]; // L: 177 + this.retextureTo = new short[var3]; // L: 178 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 179 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181 } - } else if (var2 == 42) { - this.shiftClickIndex = var1.readByte(); - } else if (var2 == 65) { + } else if (var2 == 42) { // L: 184 + this.shiftClickIndex = var1.readByte(); // L: 185 + } else if (var2 == 65) { // L: 187 this.isTradable = true; - } else if (var2 == 78) { + } else if (var2 == 78) { // L: 188 this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { + } else if (var2 == 79) { // L: 189 this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { + } else if (var2 == 90) { // L: 190 this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { + } else if (var2 == 91) { // L: 191 this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { + } else if (var2 == 92) { // L: 192 this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { + } else if (var2 == 93) { // L: 193 this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 94) { - var1.readUnsignedShort(); + } else if (var2 == 94) { // L: 194 + var1.readUnsignedShort(); // L: 195 } else if (var2 == 95) { - this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { + this.zan2d = var1.readUnsignedShort(); // L: 197 + } else if (var2 == 97) { // L: 198 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { + } else if (var2 == 98) { // L: 199 this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { - if (this.countobj == null) { - this.countobj = new int[10]; - this.countco = new int[10]; + } else if (var2 >= 100 && var2 < 110) { // L: 200 + if (this.countobj == null) { // L: 201 + this.countobj = new int[10]; // L: 202 + this.countco = new int[10]; // L: 203 } - this.countobj[var2 - 100] = var1.readUnsignedShort(); - this.countco[var2 - 100] = var1.readUnsignedShort(); - } else if (var2 == 110) { + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206 + } else if (var2 == 110) { // L: 208 this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { + } else if (var2 == 111) { // L: 209 this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { + } else if (var2 == 112) { // L: 210 this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { + } else if (var2 == 113) { // L: 211 this.ambient = var1.readByte(); - } else if (var2 == 114) { + } else if (var2 == 114) { // L: 212 this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { + } else if (var2 == 115) { // L: 213 this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { + } else if (var2 == 139) { // L: 214 this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { + } else if (var2 == 140) { // L: 215 this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { + } else if (var2 == 148) { // L: 216 this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { + } else if (var2 == 149) { // L: 217 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = KeyHandler.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 218 + this.params = class13.readStringIntParameters(var1, this.params); } } - } + } // L: 220 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lfa;Lfa;I)V", - garbageValue = "-2130497191" + descriptor = "(Lff;Lff;B)V", + garbageValue = "-19" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; + 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; 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; - } + this.recolorTo = var1.recolorTo; // L: 231 + this.retextureFrom = var1.retextureFrom; // L: 232 + this.retextureTo = var1.retextureTo; // L: 233 + this.name = var2.name; // L: 234 + this.isMembersOnly = var2.isMembersOnly; // L: 235 + this.price = var2.price; // L: 236 + this.isStackable = 1; // L: 237 + } // L: 238 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lfa;Lfa;I)V", - garbageValue = "-770836637" + descriptor = "(Lff;Lff;I)V", + garbageValue = "-2034384868" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var2.recolorFrom; - 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) { + this.model = var1.model; // L: 241 + this.zoom2d = var1.zoom2d; // L: 242 + this.xan2d = var1.xan2d; // L: 243 + this.yan2d = var1.yan2d; // L: 244 + this.zan2d = var1.zan2d; // L: 245 + this.offsetX2d = var1.offsetX2d; // L: 246 + this.offsetY2d = var1.offsetY2d; // L: 247 + this.recolorFrom = var2.recolorFrom; // L: 248 + this.recolorTo = var2.recolorTo; // L: 249 + this.retextureFrom = var2.retextureFrom; // L: 250 + this.retextureTo = var2.retextureTo; // L: 251 + this.name = var2.name; // L: 252 + this.isMembersOnly = var2.isMembersOnly; // L: 253 + this.isStackable = var2.isStackable; // L: 254 + this.maleModel = var2.maleModel; // L: 255 + this.maleModel1 = var2.maleModel1; // L: 256 + this.maleModel2 = var2.maleModel2; // L: 257 + this.femaleModel = var2.femaleModel; // L: 258 + this.femaleModel1 = var2.femaleModel1; // L: 259 + this.femaleModel2 = var2.femaleModel2; // L: 260 + this.maleHeadModel = var2.maleHeadModel; // L: 261 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 262 + this.femaleHeadModel = var2.femaleHeadModel; // L: 263 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 264 + this.team = var2.team; // L: 265 + this.groundActions = var2.groundActions; // L: 266 + this.inventoryActions = new String[5]; // L: 267 + if (var2.inventoryActions != null) { // L: 268 for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } - this.inventoryActions[4] = "Discard"; - this.price = 0; - } + this.inventoryActions[4] = "Discard"; // L: 269 + this.price = 0; // L: 270 + } // L: 271 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lfa;Lfa;I)V", - garbageValue = "1807030735" + descriptor = "(Lff;Lff;I)V", + garbageValue = "1014802643" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = 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; - } + this.model = var1.model; // L: 274 + this.zoom2d = var1.zoom2d; // L: 275 + this.xan2d = var1.xan2d; // L: 276 + this.yan2d = var1.yan2d; // L: 277 + this.zan2d = var1.zan2d; // L: 278 + this.offsetX2d = var1.offsetX2d; // L: 279 + this.offsetY2d = var1.offsetY2d; // L: 280 + this.recolorFrom = var1.recolorFrom; // L: 281 + this.recolorTo = var1.recolorTo; // L: 282 + this.retextureFrom = var1.retextureFrom; // L: 283 + this.retextureTo = var1.retextureTo; // L: 284 + this.isStackable = var1.isStackable; // L: 285 + this.name = var2.name; // L: 286 + this.price = 0; // L: 287 + this.isMembersOnly = false; // L: 288 + this.isTradable = false; // L: 289 + } // L: 290 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Lgi;", - garbageValue = "-1268631863" + descriptor = "(II)Lgk;", + garbageValue = "1329833901" ) @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { - int var2 = -1; + if (this.countobj != null && var1 > 1) { // L: 293 + int var2 = -1; // L: 294 - for (var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + for (var3 = 0; var3 < 10; ++var3) { // L: 295 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296 var2 = this.countobj[var3]; } } - if (var2 != -1) { - return class87.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { // L: 298 + return TaskHandler.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var4 == null) { + ModelData var4 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, this.model, 0); // L: 300 + if (var4 == null) { // L: 301 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302 var4.resize(this.resizeX, this.resizeY, this.resizeZ); } - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + if (this.recolorFrom != null) { // L: 303 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 304 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 305 } } - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[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 } } - return var4; + return var4; // L: 313 } } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IB)Lhl;", - garbageValue = "0" + descriptor = "(IS)Lhl;", + garbageValue = "-15441" ) @Export("getModel") public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; + if (this.countobj != null && var1 > 1) { // L: 317 + int var2 = -1; // L: 318 - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + for (int var3 = 0; var3 < 10; ++var3) { // L: 319 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320 var2 = this.countobj[var3]; } } - if (var2 != -1) { - return class87.ItemDefinition_get(var2).getModel(1); + if (var2 != -1) { // L: 322 + return TaskHandler.ItemDefinition_get(var2).getModel(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); - if (var5 != null) { + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324 + if (var5 != null) { // L: 325 return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var6 == null) { + ModelData var6 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, this.model, 0); // L: 326 + if (var6 == null) { // L: 327 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 var6.resize(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 329 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 334 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336 } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339 + var5.isSingleTile = true; // L: 340 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341 + return var5; // L: 342 } } } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)Lfa;", - garbageValue = "1712782544" - ) - @Export("getCountObj") - public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; - - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { - return class87.ItemDefinition_get(var2); - } - } - - return this; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "1166597620" - ) - @Export("hasNoValidModel") - public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (var1) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; - } - - if (var2 == -1) { - return true; - } else { - boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var5 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var5 = false; - } - - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { - var5 = false; - } - - return var5; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ZB)Lgi;", - garbageValue = "24" - ) - public final ModelData method3290(boolean var1) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (var1) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; - } - - if (var2 == -1) { - return null; - } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); - ModelData[] var8 = new ModelData[]{var5, var6, var7}; - var5 = new ModelData(var8, 3); - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; - var5 = new ModelData(var10, 2); - } - } - - if (!var1 && this.maleOffset != 0) { - var5.changeOffset(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { - var5.changeOffset(0, this.femaleOffset, 0); - } - - int var9; - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - return var5; - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ZS)Z", - garbageValue = "2699" - ) - public final boolean method3266(boolean var1) { - int var2 = this.maleHeadModel; - int var3 = this.maleHeadModel2; - if (var1) { - var2 = this.femaleHeadModel; - var3 = this.femaleHeadModel2; - } - - if (var2 == -1) { - return true; - } else { - boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var4 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var4 = false; - } - - return var4; - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ZS)Lgi;", - garbageValue = "27853" - ) - public final ModelData method3267(boolean var1) { - int var2 = this.maleHeadModel; - int var3 = this.maleHeadModel2; - if (var1) { - var2 = this.femaleHeadModel; - var3 = this.femaleHeadModel2; - } - - if (var2 == -1) { - return null; - } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - ModelData[] var6 = new ModelData[]{var4, var5}; - var4 = new ModelData(var6, 2); - } - - int var7; - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); - } - } - - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); - } - } - - return var4; - } - } - @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Lff;", + garbageValue = "573530430" + ) + @Export("getCountObj") + public ItemComposition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { // L: 346 + int var2 = -1; // L: 347 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 348 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; // L: 349 + } + } + + if (var2 != -1) { // L: 351 + return TaskHandler.ItemDefinition_get(var2); + } + } + + return this; // L: 353 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-1361856849" + ) + @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 + } + + if (var2 == -1) { // L: 446 + return true; + } else { + boolean var5 = true; // L: 447 + if (!HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448 + var5 = false; + } + + if (var3 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449 + var5 = false; + } + + if (var4 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450 + var5 = false; + } + + return var5; // L: 451 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ZB)Lgk;", + garbageValue = "114" + ) + public final ModelData method3397(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 + } + + if (var2 == -1) { // L: 463 + return null; + } else { + ModelData var5 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var2, 0); // L: 464 + if (var3 != -1) { // L: 465 + ModelData var6 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var3, 0); // L: 466 + if (var4 != -1) { // L: 467 + ModelData var7 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var4, 0); // L: 468 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 469 + var5 = new ModelData(var8, 3); // L: 470 + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 473 + var5 = new ModelData(var10, 2); // L: 474 + } + } + + if (!var1 && this.maleOffset != 0) { // L: 477 + var5.changeOffset(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { // L: 478 + 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.retextureFrom != null) { // L: 484 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 485 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 486 + } + } + + return var5; // L: 489 + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-1905200886" + ) + public final boolean method3342(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 + } + + if (var2 == -1) { // L: 499 + return true; + } else { + boolean var4 = true; // L: 500 + if (!HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 501 + var4 = false; + } + + if (var3 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 502 + var4 = false; + } + + return var4; // L: 503 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ZB)Lgk;", + garbageValue = "92" + ) + public final ModelData method3409(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 + } + + if (var2 == -1) { // L: 513 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var2, 0); // L: 514 + if (var3 != -1) { // L: 515 + ModelData var5 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var3, 0); // L: 516 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 517 + var4 = new ModelData(var6, 2); // L: 518 + } + + 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.retextureFrom != null) { // L: 525 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 526 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 527 + } + } + + return var4; // L: 530 + } + } + + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-101476458" + garbageValue = "722910624" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return NPC.method2251(this.params, var1, var2); // L: 534 } - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "47" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1720337072" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return VarbitComposition.method3205(this.params, var1, var2); // L: 538 } - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1901653558" + garbageValue = "-668917541" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { - if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -321032365 * -563958565 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 542 + if (this.shiftClickIndex >= 0) { // L: 543 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1492002977 * 185222303 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 544 } } else { return -1; } } - @ObfuscatedName("h") + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "87" + ) + boolean method3368() { + return this.recolorTo != null; // L: 561 + } + + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-712243008" + garbageValue = "983299957" ) - boolean method3297() { - return this.recolorTo != null; + boolean method3347() { + return this.retextureTo != null; // L: 565 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Len;", + garbageValue = "1216305288" + ) + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([I[II)V", + garbageValue = "1539024101" + ) + public static void method3408(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 43 + class176.ByteArrayPool_alternativeSizes = var0; // L: 50 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51 + class260.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52 + + for (int var2 = 0; var2 < class176.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53 + class260.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54 + ByteArrayPool.field3890.add(var0[var2]); // L: 55 + } + + Collections.sort(ByteArrayPool.field3890); // L: 57 + } else { + class176.ByteArrayPool_alternativeSizes = null; // L: 44 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 45 + class260.ByteArrayPool_arrays = null; // L: 46 + class301.method5508(); // L: 47 + } + } // L: 48 58 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-1491033434" + ) + public static int method3407(CharSequence var0, int var1) { + return AttackOption.method2304(var0, var1, true); // L: 80 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "938633925" + descriptor = "(II)Z", + garbageValue = "-76865797" ) - boolean method3272() { - return this.retextureTo != null; + public static boolean method3403(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field119[var0] : false; // L: 229 230 } - @ObfuscatedName("t") - public static int method3327(long var0) { - return (int)(var0 >>> 7 & 127L); - } + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1755655123" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (class174.loadInterface(var0)) { // L: 11121 + class150.runComponentCloseListeners(WorldMapSection1.Widget_interfaceComponents[var0], var1); // L: 11122 + } + } // L: 11123 + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1815140573" + ) + static void method3406() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11283 + int var1 = var0.group; // L: 11284 + if (class174.loadInterface(var1)) { // L: 11285 + boolean var2 = true; // L: 11286 + Widget[] var3 = WorldMapSection1.Widget_interfaceComponents[var1]; // L: 11287 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11288 + if (var3[var4] != null) { // L: 11289 + var2 = var3[var4].isIf3; // L: 11290 + break; + } + } + + if (!var2) { // L: 11294 + var4 = (int)var0.key; // L: 11295 + Widget var5 = UserComparator9.getWidget(var4); // L: 11296 + if (var5 != null) { // L: 11297 + class184.invalidateWidget(var5); + } + } + } + } + + } // L: 11301 } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 8763dc12a4..2d69300f86 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,112 +1,63 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bq") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("bm") - static String field1009; - @ObfuscatedName("eh") - @ObfuscatedSignature( - descriptor = "Lky;" + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1777464625 ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("q") + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lau;" + ) + @Export("pcmPlayerProvider") + public static class45 pcmPlayerProvider; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + static Bounds field998; + @ObfuscatedName("w") @Export("ids") int[] ids; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("quantities") int[] quantities; static { - itemContainers = new NodeHashTable(32); + itemContainers = new NodeHashTable(32); // L: 7 } ItemContainer() { - this.ids = new int[]{-1}; - this.quantities = new int[]{0}; - } + this.ids = new int[]{-1}; // L: 8 + this.quantities = new int[]{0}; // L: 9 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lfn;", - garbageValue = "1889107784" + descriptor = "(IIB)Ljf;", + garbageValue = "-13" ) - public static HitSplatDefinition method2057(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = UserComparator9.getWidget(var0); // L: 209 + if (var1 == -1) { // L: 210 + return var2; } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "159025977" - ) - static int method2059(int var0, int var1) { - FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - FloorOverlayDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var3 = new FloorOverlayDefinition(); - if (var4 != null) { - var3.decode(new Buffer(var4), var0); - } - - var3.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var6; - if (var2.texture >= 0) { - var6 = Client.method1588(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var6] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var6 = class275.method5120(var2.hue, var2.saturation, var2.lightness); - int var5 = Client.method1588(var6, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; - } - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2066251620" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - MouseHandler.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212 } } } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index db8b732415..bab72562e6 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -1,101 +1,122 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gy") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("l") + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Lmp;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("gc") @ObfuscatedGetter( - intValue = 843492453 + longValue = 8670349305611552211L + ) + static long field2244; + @ObfuscatedName("gt") + @ObfuscatedGetter( + intValue = 1769768495 + ) + static int field2243; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1593426589 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1629429381 + intValue = -631100007 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -549763557 + intValue = -990530771 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("first") Renderable first; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("second") Renderable second; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("third") Renderable third; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -4918137841721985399L + longValue = -5203954899972942883L ) @Export("tag") long tag; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 844864059 + intValue = 581220091 ) @Export("height") int height; ItemLayer() { + } // L: 13 + + @ObfuscatedName("i") + public static boolean method4106(long var0) { + boolean var2 = 0L != var0; // L: 44 + if (var2) { // L: 45 + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 48 + var2 = !var3; // L: 50 + } + + return var2; // L: 52 } - @ObfuscatedName("ed") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IZZZI)Lky;", - garbageValue = "-1474913181" + descriptor = "(Ljy;B)V", + garbageValue = "22" ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; - if (JagexCache.JagexCache_dat2File != null) { - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); - } + public static void method4108(Huffman var0) { + class264.huffman = var0; // L: 14 + } // L: 15 - return new Archive(var4, HealthBarUpdate.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("ky") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1673843314" + descriptor = "(B)Low;", + garbageValue = "1" ) - static final void method4020() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); - } - - Iterator var2 = Messages.Messages_hashTable.iterator(); - - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); - } - - if (class264.friendsChat != null) { - class264.friendsChat.clearFriends(); + static SpritePixels method4107() { + SpritePixels var0 = new SpritePixels(); // L: 192 + var0.width = class414.SpriteBuffer_spriteWidth; // L: 193 + var0.height = class414.SpriteBuffer_spriteHeight; // L: 194 + var0.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 195 + var0.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 196 + var0.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 197 + var0.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 198 + int var1 = var0.subWidth * var0.subHeight; // L: 199 + byte[] var2 = class295.SpriteBuffer_pixels[0]; // L: 200 + var0.pixels = new int[var1]; // L: 201 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 202 + var0.pixels[var3] = HitSplatDefinition.SpriteBuffer_spritePalette[var2[var3] & 255]; } + PacketBuffer.method6913(); // L: 203 + return var0; // L: 204 } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 87a4a39af4..8d0a013d87 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,132 +4,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("lm") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("head") DualNode head; public IterableDualNodeQueue() { - this.sentinel = new DualNode(); - this.sentinel.previousDual = this.sentinel; - this.sentinel.nextDual = this.sentinel; - } + this.sentinel = new DualNode(); // L: 7 + this.sentinel.previousDual = this.sentinel; // L: 11 + this.sentinel.nextDual = this.sentinel; // L: 12 + } // L: 13 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("clear") public void clear() { - while (this.sentinel.previousDual != this.sentinel) { - this.sentinel.previousDual.removeDual(); + while (this.sentinel.previousDual != this.sentinel) { // L: 16 + this.sentinel.previousDual.removeDual(); // L: 17 } - } + } // L: 19 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnt;)V" ) @Export("add") public void add(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 22 var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; - var1.previousDual = this.sentinel; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } + 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 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lnu;" + descriptor = "()Lnt;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; + DualNode var1 = this.sentinel.previousDual; // L: 38 if (var1 == this.sentinel) { - return null; + return null; // L: 39 } else { - var1.removeDual(); - return var1; + var1.removeDual(); // L: 40 + return var1; // L: 41 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnu;" + descriptor = "()Lnt;" ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); + return this.previousOrLast((DualNode)null); // L: 45 } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;)Lnu;" + descriptor = "(Lnt;)Lnt;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { + if (var1 == null) { // L: 50 var2 = this.sentinel.previousDual; } else { - var2 = var1; + var2 = var1; // L: 51 } - if (var2 == this.sentinel) { - this.head = null; - return null; + if (var2 == this.sentinel) { // L: 52 + this.head = null; // L: 53 + return null; // L: 54 } else { - this.head = var2.previousDual; - return var2; + this.head = var2.previousDual; // L: 56 + return var2; // L: 57 } } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lnu;" + descriptor = "()Lnt;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; - if (var1 == this.sentinel) { - this.head = null; - return null; + DualNode var1 = this.head; // L: 61 + if (var1 == this.sentinel) { // L: 62 + this.head = null; // L: 63 + return null; // L: 64 } else { - this.head = var1.previousDual; - return var1; + this.head = var1.previousDual; // L: 66 + return var1; // L: 67 } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); + return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;)V" + descriptor = "(Lnt;Lnt;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { - if (var0.nextDual != null) { + if (var0.nextDual != null) { // L: 30 var0.removeDual(); } - var0.nextDual = var1; - var0.previousDual = var1.previousDual; - var0.nextDual.previousDual = var0; - var0.previousDual.nextDual = var0; - } + 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 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index febb1dd2a9..0e16ce8b62 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,61 +4,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("ld") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llm;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("head") DualNode head; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Llh;)V" + descriptor = "(Llm;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.last = null; - this.queue = var1; - this.head = this.queue.sentinel.previousDual; - this.last = null; - } + 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 public boolean hasNext() { - return this.queue.sentinel != this.head; - } - - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.removeDual(); - this.last = null; - } + return this.queue.sentinel != this.head; // L: 29 } public Object next() { - DualNode var1 = this.head; - if (var1 == this.queue.sentinel) { - var1 = null; - this.head = null; + DualNode var1 = this.head; // L: 18 + if (var1 == this.queue.sentinel) { // L: 19 + var1 = null; // L: 20 + this.head = null; // L: 21 } else { - this.head = var1.previousDual; + this.head = var1.previousDual; // L: 23 } - this.last = var1; - return var1; + this.last = var1; // L: 24 + return var1; // L: 25 } + + public void remove() { + if (this.last == null) { // L: 33 + throw new IllegalStateException(); + } else { + this.last.removeDual(); // L: 34 + this.last = null; // L: 35 + } + } // L: 36 } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index d36ca65bc2..ac04aef003 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,233 +5,233 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("kf") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) - Node field3828; + Node field3816; public IterableNodeDeque() { - this.sentinel = new Node(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Node(); // L: 7 + this.sentinel.previous = this.sentinel; // L: 11 + this.sentinel.next = this.sentinel; // L: 12 + } // L: 13 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("rsClear") public void rsClear() { - while (this.sentinel.previous != this.sentinel) { - this.sentinel.previous.remove(); + while (this.sentinel.previous != this.sentinel) { // L: 16 + this.sentinel.previous.remove(); // L: 17 } - } + } // L: 19 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lns;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 22 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lns;)V" ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 30 var1.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; - } + 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 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("last") public Node last() { - return this.method5567((Node)null); + return this.method5608((Node)null); // L: 46 } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;)Lnv;" + descriptor = "(Lns;)Lns;" ) - Node method5567(Node var1) { + Node method5608(Node var1) { Node var2; - if (var1 == null) { + if (var1 == null) { // L: 51 var2 = this.sentinel.previous; } else { - var2 = var1; + var2 = var1; // L: 52 } - if (var2 == this.sentinel) { - this.field3828 = null; - return null; + if (var2 == this.sentinel) { // L: 53 + this.field3816 = null; // L: 54 + return null; // L: 55 } else { - this.field3828 = var2.previous; - return var2; + this.field3816 = var2.previous; // L: 57 + return var2; // L: 58 } } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "()Lnv;" - ) - @Export("previous") - public Node previous() { - Node var1 = this.field3828; - if (var1 == this.sentinel) { - this.field3828 = null; - return null; - } else { - this.field3828 = var1.previous; - return var1; - } - } - - @ObfuscatedName("a") - int method5612() { - int var1 = 0; - - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { - ++var1; - } - - return var1; - } - @ObfuscatedName("e") - public boolean method5563() { - return this.sentinel.previous == this.sentinel; + @ObfuscatedSignature( + descriptor = "()Lns;" + ) + @Export("previous") + public Node previous() { + Node var1 = this.field3816; // L: 62 + if (var1 == this.sentinel) { // L: 63 + this.field3816 = null; // L: 64 + return null; // L: 65 + } else { + this.field3816 = var1.previous; // L: 67 + return var1; // L: 68 + } } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "()[Lnv;" - ) - Node[] method5564() { - Node[] var1 = new Node[this.method5612()]; - int var2 = 0; + @ObfuscatedName("p") + int method5610() { + int var1 = 0; // L: 72 - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 + ++var1; // L: 75 } - return var1; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lnv;)Z" - ) - boolean method5569(Node var1) { - this.addFirst(var1); - return true; - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; - } - - return var1; - } - - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); - } - - public boolean isEmpty() { - return this.method5563(); - } - - public boolean remove(Object var1) { - throw new RuntimeException(); - } - - public boolean retainAll(Collection var1) { - throw new RuntimeException(); - } - - public void clear() { - this.rsClear(); - } - - public boolean add(Object var1) { - return this.method5569((Node)var1); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - - public int hashCode() { - return super.hashCode(); - } - - public boolean contains(Object var1) { - throw new RuntimeException(); - } - - public Object[] toArray() { - return this.method5564(); - } - - public int size() { - return this.method5612(); - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); + return var1; // L: 78 } @ObfuscatedName("j") + public boolean method5633() { + return this.sentinel.previous == this.sentinel; // L: 82 + } + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnv;Lnv;)V" + descriptor = "()[Lns;" + ) + Node[] method5612() { + Node[] var1 = new Node[this.method5610()]; // L: 86 + int var2 = 0; // L: 87 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 + var1[var2++] = var3; // L: 90 + } + + return var1; // L: 93 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lns;)Z" + ) + boolean method5615(Node var1) { + this.addFirst(var1); // L: 127 + return true; // L: 128 + } + + public boolean isEmpty() { + return this.method5633(); // L: 105 + } + + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 109 + } + + public Object[] toArray() { + return this.method5612(); // L: 113 + } + + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 117 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 + var1[var2++] = var3; // L: 120 + } + + return var1; // L: 123 + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 140 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 + } + + public boolean add(Object var1) { + return this.method5615((Node)var1); // L: 156 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 + } + + public int hashCode() { + return super.hashCode(); // L: 164 + } + + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 + } + + public int size() { + return this.method5610(); // L: 101 + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 136 + } + + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); // L: 97 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 148 + } + + public void clear() { + this.rsClear(); // L: 152 + } // L: 153 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lns;Lns;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { + if (var0.next != null) { // L: 38 var0.remove(); } - var0.next = var1; - var0.previous = var1.previous; - var0.next.previous = var0; - var0.previous.next = var0; - } + 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 } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index a10fdfc1be..02b45ed9a3 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,75 +4,75 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kw") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lkf;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) - Node field3826; - @ObfuscatedName("f") + Node field3813; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lkt;)V" + descriptor = "(Lkf;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.last = null; - this.setDeque(var1); - } + this.last = null; // L: 9 + this.setDeque(var1); // L: 12 + } // L: 13 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkt;)V" + descriptor = "(Lkf;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { - this.deque = var1; - this.start(); - } + this.deque = var1; // L: 16 + this.start(); // L: 17 + } // L: 18 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("start") void start() { - this.field3826 = this.deque != null ? this.deque.sentinel.previous : null; - this.last = null; - } + this.field3813 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.last = null; // L: 22 + } // L: 23 public Object next() { - Node var1 = this.field3826; - if (var1 == this.deque.sentinel) { - var1 = null; - this.field3826 = null; + Node var1 = this.field3813; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3813 = null; // L: 29 } else { - this.field3826 = var1.previous; + this.field3813 = var1.previous; // L: 31 } - this.last = var1; - return var1; + this.last = var1; // L: 32 + return var1; // L: 33 } public boolean hasNext() { - return this.deque.sentinel != this.field3826 && this.field3826 != null; + return this.deque.sentinel != this.field3813 && this.field3813 != null; // L: 37 } public void remove() { - if (this.last == null) { + if (this.last == null) { // L: 41 throw new IllegalStateException(); } else { - this.last.remove(); - this.last = null; + this.last.remove(); // L: 42 + this.last = null; // L: 43 } - } + } // L: 44 } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 702e3e6aab..e24de57c3b 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,141 +4,141 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("nf") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("size") int size; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lnv;" + descriptor = "[Lns;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("current") Node current; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("index") int index; public IterableNodeHashTable(int var1) { - this.index = 0; - this.size = var1; - this.buckets = new Node[var1]; + this.index = 0; // L: 11 + this.size = var1; // L: 14 + this.buckets = new Node[var1]; // L: 15 - for (int var2 = 0; var2 < var1; ++var2) { - Node var3 = this.buckets[var2] = new Node(); - var3.previous = var3; - var3.next = var3; + 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 } - } + } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(J)Lnv;" + descriptor = "(J)Lns;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 - 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; + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32 + if (this.currentGet.key == var1) { // L: 27 + Node var4 = this.currentGet; // L: 28 + this.currentGet = this.currentGet.previous; // L: 29 + return var4; // L: 30 } } - this.currentGet = null; - return null; + this.currentGet = null; // L: 34 + return null; // L: 35 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnv;J)V" + descriptor = "(Lns;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { + if (var1.next != null) { // L: 39 var1.remove(); } - 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; - } + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40 + var1.next = var4.next; // L: 41 + var1.previous = var4; // L: 42 + var1.next.previous = var1; // L: 43 + var1.previous.next = var1; // L: 44 + var1.key = var2; // L: 45 + } // L: 46 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { - Node var2 = this.buckets[var1]; + for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 + Node var2 = this.buckets[var1]; // L: 50 while (true) { - Node var3 = var2.previous; - if (var3 == var2) { + Node var3 = var2.previous; // L: 52 + if (var3 == var2) { // L: 53 break; } - var3.remove(); + var3.remove(); // L: 54 } } - this.currentGet = null; - this.current = null; - } + this.currentGet = null; // L: 57 + this.current = null; // L: 58 + } // L: 59 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 62 + return this.next(); // L: 63 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { - var1 = this.current; - this.current = var1.previous; - return var1; + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 + var1 = this.current; // L: 68 + this.current = var1.previous; // L: 69 + return var1; // L: 70 } else { do { - if (this.index >= this.size) { - return null; + if (this.index >= this.size) { // L: 72 + return null; // L: 79 } - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + var1 = this.buckets[this.index++].previous; // L: 73 + } while(var1 == this.buckets[this.index - 1]); // L: 74 - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 75 + return var1; // L: 76 } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); + return new IterableNodeHashTableIterator(this); // L: 83 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 44cfa7023c..5577319ede 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,89 +4,93 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("nr") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("head") Node head; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lnz;)V" + descriptor = "(Lnf;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.last = null; - this.hashTable = var1; - this.start(); - } + this.last = null; // L: 10 + this.hashTable = var1; // L: 13 + this.start(); // L: 14 + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("start") void start() { - this.head = this.hashTable.buckets[0].previous; - this.index = 1; - this.last = null; - } + this.head = this.hashTable.buckets[0].previous; // L: 18 + this.index = 1; // L: 19 + this.last = null; // L: 20 + } // L: 21 public Object next() { Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { - var1 = this.head; - this.head = var1.previous; - this.last = var1; - return var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 + var1 = this.head; // L: 25 + this.head = var1.previous; // L: 26 + this.last = var1; // L: 27 + return var1; // L: 28 } else { do { - if (this.index >= this.hashTable.size) { - return null; + if (this.index >= this.hashTable.size) { // L: 30 + return null; // L: 38 } - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); + var1 = this.hashTable.buckets[this.index++].previous; // L: 31 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 - this.head = var1.previous; - this.last = var1; - return var1; + this.head = var1.previous; // L: 33 + this.last = var1; // L: 34 + return var1; // L: 35 } } public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 return true; } else { - while (this.index < this.hashTable.size) { - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { - this.head = this.hashTable.buckets[this.index - 1].previous; - return true; + while (this.index < this.hashTable.size) { // L: 43 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 + return true; // L: 46 } - this.head = this.hashTable.buckets[this.index - 1]; + this.head = this.hashTable.buckets[this.index - 1]; // L: 49 } - return false; + return false; // L: 52 } } public void remove() { - this.last.remove(); - this.last = null; - } + if (this.last == null) { // L: 56 + throw new IllegalStateException(); + } else { + this.last.remove(); // L: 57 + this.last = null; // L: 58 + } + } // L: 59 } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index cba40f12d3..d5a66b2e9e 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,55 +1,55 @@ import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("er") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("j") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("m") + @ObfuscatedName("tm") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("o") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lnq;" + descriptor = "Lnw;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lnq;" + descriptor = "Lnw;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lnq;" + descriptor = "Lnw;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "[Lnq;" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1050074169 ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("m") + @Export("operatingSystemName") + static String operatingSystemName; + @ObfuscatedName("fn") + static String field1560; static { - JagexCache_randomDat = null; - JagexCache_dat2File = null; - JagexCache_idx255File = null; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1155193506" - ) - public static int method2815() { - return KeyHandler.KeyHandler_idleCycles; + JagexCache_randomDat = null; // L: 22 + JagexCache_dat2File = null; // L: 23 + JagexCache_idx255File = null; // L: 24 } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index bd5116cd23..432c265c2d 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,293 +8,288 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("f") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ln;" + descriptor = "Lf;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("e") - static int[] field145; - @ObfuscatedName("bv") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -906031261 + intValue = -63939899 ) - static int field142; - @ObfuscatedName("cr") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "[Loe;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("cl") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cq") - public static boolean[] field128; @ObfuscatedName("cs") - public static boolean[] field129; - @ObfuscatedName("cz") - public static int[] field130; + public static boolean[] field118; + @ObfuscatedName("ce") + public static boolean[] field119; + @ObfuscatedName("cw") + public static int[] field120; + @ObfuscatedName("cr") + @ObfuscatedGetter( + intValue = 1842279411 + ) + public static int field133; @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1372251093 + intValue = 1242888699 ) - public static int field144; + public static int field122; + @ObfuscatedName("cc") + static char[] field112; + @ObfuscatedName("ch") + static int[] field124; + @ObfuscatedName("cz") + public static int[] field125; @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1181141701 + intValue = -1596071901 ) - public static int field123; - @ObfuscatedName("cn") - static char[] field133; + public static int field110; @ObfuscatedName("cf") - static int[] field134; - @ObfuscatedName("ch") - public static int[] field135; - @ObfuscatedName("cc") - @ObfuscatedGetter( - intValue = 613092295 - ) - public static int field136; - @ObfuscatedName("cj") - public static int[] field137; - @ObfuscatedName("co") - @ObfuscatedGetter( - intValue = -1951942129 - ) - public static int field140; - @ObfuscatedName("ck") - @ObfuscatedGetter( - intValue = -764636131 - ) - public static int field139; - @ObfuscatedName("cb") - @ObfuscatedGetter( - intValue = -1860624425 - ) - public static int field127; + public static int[] field127; @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 245979357 + intValue = 480310243 ) - public static int field126; - @ObfuscatedName("db") + public static int field135; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -825263243 + intValue = -1155674015 + ) + public static int field107; + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = 850126411 + ) + public static int field130; + @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = -253664609 + ) + public static int field131; + @ObfuscatedName("dq") + @ObfuscatedGetter( + intValue = -442212747 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("dx") + @ObfuscatedName("df") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; static { - KeyHandler_instance = new KeyHandler(); - KeyHandler_pressedKeys = new boolean[112]; - field128 = new boolean[112]; - field129 = new boolean[112]; - field130 = new int[128]; - field144 = 0; - field123 = 0; - field133 = new char[128]; - field134 = new int[128]; - field135 = new int[128]; - field136 = 0; - field137 = new int[128]; - field140 = 0; - field139 = 0; - field127 = 0; - field126 = 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_instance = new KeyHandler(); // L: 14 + KeyHandler_pressedKeys = new boolean[112]; // L: 101 + field118 = new boolean[112]; // L: 102 + field119 = new boolean[112]; // L: 103 + field120 = new int[128]; // L: 106 + field133 = 0; // L: 107 + field122 = 0; // L: 108 + field112 = new char[128]; // L: 109 + field124 = new int[128]; // L: 110 + field125 = new int[128]; // L: 111 + field110 = 0; // L: 112 + field127 = new int[128]; // L: 113 + field135 = 0; // L: 114 + field107 = 0; // L: 115 + field130 = 0; // L: 116 + field131 = 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() { - } + } // L: 121 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2]; - if ((var2 & 128) != 0) { + if (KeyHandler_instance != null) { // L: 138 + int var2 = var1.getKeyCode(); // L: 139 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 140 + var2 = KeyHandler_keyCodes[var2]; // L: 141 + if ((var2 & 128) != 0) { // L: 142 var2 = -1; } } else { - var2 = -1; + var2 = -1; // L: 144 } - if (field123 >= 0 && var2 >= 0) { - field130[field123] = var2; - field123 = field123 + 1 & 127; - if (field144 == field123) { - field123 = -1; + if (field122 >= 0 && var2 >= 0) { // L: 145 + field120[field122] = var2; // L: 146 + field122 = field122 + 1 & 127; // L: 147 + if (field133 == field122) { // L: 148 + field122 = -1; } } int var3; - if (var2 >= 0) { - var3 = field127 + 1 & 127; - if (var3 != field139) { - field134[field127] = var2; - field133[field127] = 0; - field127 = var3; + if (var2 >= 0) { // L: 150 + var3 = field130 + 1 & 127; // L: 151 + if (var3 != field107) { // L: 152 + field124[field130] = var2; // L: 153 + field112[field130] = 0; // L: 154 + field130 = var3; // L: 155 } } - var3 = var1.getModifiers(); - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { - var1.consume(); + var3 = var1.getModifiers(); // L: 158 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 159 + var1.consume(); // L: 160 } } - } - - public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2] & -129; - } else { - var2 = -1; - } - - if (field123 >= 0 && var2 >= 0) { - field130[field123] = ~var2; - field123 = field123 + 1 & 127; - if (field123 == field144) { - field123 = -1; - } - } - } - - var1.consume(); - } - - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field123 = -1; - } - - } + } // L: 163 public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff') { + if (KeyHandler_instance != null) { // L: 180 + char var2 = var1.getKeyChar(); // L: 181 + if (var2 != 0 && var2 != '\uffff') { // L: 182 boolean var3; - if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { - var3 = true; + if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 185 + var3 = true; // L: 186 } else { label57: { - if (var2 != 0) { - char[] var4 = class316.cp1252AsciiExtension; + if (var2 != 0) { // L: 189 + char[] var4 = class316.cp1252AsciiExtension; // L: 191 - for (int var5 = 0; var5 < var4.length; ++var5) { - char var6 = var4[var5]; - if (var2 == var6) { - var3 = true; + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 192 + char var6 = var4[var5]; // L: 193 + if (var6 == var2) { // L: 195 + var3 = true; // L: 196 break label57; } } } - var3 = false; + var3 = false; // L: 203 } } - if (var3) { - int var7 = field127 + 1 & 127; - if (var7 != field139) { - field134[field127] = -1; - field133[field127] = var2; - field127 = var7; + if (var3) { // L: 205 + int var7 = field130 + 1 & 127; // L: 206 + if (var7 != field107) { // L: 207 + field124[field130] = -1; // L: 208 + field112[field130] = var2; // L: 209 + field130 = var7; // L: 210 } } } } - var1.consume(); - } + var1.consume(); // L: 215 + } // L: 216 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lot;Lnz;I)Lnz;", - garbageValue = "2091535432" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = InvDefinition.method2881(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 166 + int var2 = var1.getKeyCode(); // L: 167 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 168 + var2 = KeyHandler_keyCodes[var2] & -129; } else { - var6 = new IntegerNode(var0.readInt()); + var2 = -1; // L: 169 } - var1.put((Node)var6, (long)var5); + if (field122 >= 0 && var2 >= 0) { // L: 170 + field120[field122] = ~var2; // L: 171 + field122 = field122 + 1 & 127; // L: 172 + if (field133 == field122) { + field122 = -1; + } + } } - return var1; + var1.consume(); // L: 176 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1992278741" - ) - public static void method364() { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; + public final void focusGained(FocusEvent var1) { + } // L: 249 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 252 + field122 = -1; // L: 253 } - } - @ObfuscatedName("e") + } // L: 255 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1392114279" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1565672135" ) - public static boolean method336(int var0) { - return (var0 >> 31 & 1) != 0; - } + static final void method324(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 173 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your friend list first").toString(); + class397.addGameMessage(30, "", var1); // L: 175 + } // L: 177 - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(CS)Z", - garbageValue = "-2636" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("v") + @ObfuscatedName("hc") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "980972475" + garbageValue = "-180723004" ) - public static void method349() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - } + static void method343() { + Client.menuOptionsCount = 0; // L: 8054 + Client.isMenuOpen = false; // L: 8055 + } // L: 8056 + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "1258527468" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11951 + short[] var2 = new short[16]; // L: 11952 + int var3 = 0; // L: 11953 + + for (int var4 = 0; var4 < class129.ItemDefinition_fileCount; ++var4) { // L: 11954 + ItemComposition var9 = TaskHandler.ItemDefinition_get(var4); // L: 11955 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11956 11957 11958 + if (var3 >= 250) { // L: 11959 + Skeleton.foundItemIdCount = -1; // L: 11960 + Language.foundItemIds = null; // L: 11961 + return; // L: 11962 + } + + if (var3 >= var2.length) { // L: 11964 + short[] var6 = new short[var2.length * 2]; // L: 11965 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11966 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 11967 + } + + var2[var3++] = (short)var4; // L: 11969 + } + } + + Language.foundItemIds = var2; // L: 11971 + ClanSettings.foundItemIndex = 0; // L: 11972 + Skeleton.foundItemIdCount = var3; // L: 11973 + String[] var8 = new String[Skeleton.foundItemIdCount]; // L: 11974 + + for (int var5 = 0; var5 < Skeleton.foundItemIdCount; ++var5) { // L: 11975 + var8[var5] = TaskHandler.ItemDefinition_get(var2[var5]).name; + } + + class361.method6427(var8, Language.foundItemIds); // L: 11976 + } // L: 11977 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 2e13e0cf7d..2fa4dbe8a2 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -1,156 +1,135 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("em") +@ObfuscatedName("es") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("rh") - static boolean field1665; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("KitDefinition_archive") public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("KitDefinition_modelsArchive") public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1748939167 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("aj") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 908165149 + intValue = -748096763 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("models2") int[] models2; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("models") int[] models; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("nonSelectable") public boolean nonSelectable; static { - KitDefinition_cached = new EvictingDualNodeHashTable(64); + KitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 } KitDefinition() { - this.bodypartID = -1; - this.models = new int[]{-1, -1, -1, -1, -1}; - this.nonSelectable = false; - } + this.bodypartID = -1; // L: 15 + this.models = new int[]{-1, -1, -1, -1, -1}; // L: 21 + this.nonSelectable = false; // L: 22 + } // L: 24 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "45" + descriptor = "(Lop;B)V", + garbageValue = "-36" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 38 + if (var2 == 0) { // L: 39 + return; // L: 42 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 40 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1239600886" + descriptor = "(Lop;II)V", + garbageValue = "2034501365" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 45 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { - var3 = var1.readUnsignedByte(); - this.models2 = new int[var3]; + if (var2 == 2) { // L: 46 + var3 = var1.readUnsignedByte(); // L: 47 + this.models2 = new int[var3]; // L: 48 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 49 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 51 this.nonSelectable = true; - } else if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + } else if (var2 == 40) { // L: 52 + var3 = var1.readUnsignedByte(); // L: 53 + this.recolorFrom = new short[var3]; // L: 54 + this.recolorTo = new short[var3]; // L: 55 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 56 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 61 + var3 = var1.readUnsignedByte(); // L: 62 + this.retextureFrom = new short[var3]; // L: 63 + this.retextureTo = new short[var3]; // L: 64 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 65 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 } - } else if (var2 >= 60 && var2 < 70) { + } else if (var2 >= 60 && var2 < 70) { // L: 70 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } + } // L: 72 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1160783210" + descriptor = "(B)Z", + garbageValue = "-68" ) @Export("ready") public boolean ready() { @@ -169,296 +148,140 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lgi;", - garbageValue = "-1830587271" + descriptor = "(B)Lgk;", + garbageValue = "-84" ) @Export("getModelData") public ModelData getModelData() { if (this.models2 == null) { return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; + ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 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) { + if (var1.length == 1) { // L: 86 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); + var4 = new ModelData(var1, var1.length); // L: 87 } int var3; - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + if (this.recolorFrom != null) { // L: 88 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90 } } - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + if (this.retextureFrom != null) { // L: 93 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95 } } - return var4; + return var4; // L: 98 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1307534976" + garbageValue = "-978751148" ) - public boolean method2939() { - boolean var1 = true; + public boolean method3053() { + boolean var1 = true; // L: 102 - for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { + for (int var2 = 0; var2 < 5; ++var2) { // L: 103 + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 var1 = false; } } - return var1; + return var1; // L: 106 } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Lgi;", - garbageValue = "-45" + descriptor = "(B)Lgk;", + garbageValue = "30" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; - int var2 = 0; + ModelData[] var1 = new ModelData[5]; // L: 110 + int var2 = 0; // L: 111 - for (int var3 = 0; var3 < 5; ++var3) { - if (this.models[var3] != -1) { + for (int var3 = 0; var3 < 5; ++var3) { // L: 112 + if (this.models[var3] != -1) { // L: 113 var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); + ModelData var5 = new ModelData(var1, var2); // L: 115 int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 116 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117 + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 121 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123 } } - return var5; + return var5; // L: 126 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)Lfe;", - garbageValue = "-411855821" + garbageValue = "1023192596" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 + if (var1 != null) { // L: 74 return var1; } else { - byte[] var2 = class395.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75 + var1 = new ObjectComposition(); // L: 76 + var1.id = var0; // L: 77 + if (var2 != null) { // L: 78 var1.decode(new Buffer(var2)); } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;III)[Loz;", - garbageValue = "1507951938" - ) - public static IndexedSprite[] method2934(AbstractArchive var0, int var1, int var2) { - if (!VarbitComposition.method3102(var0, var1, var2)) { - return null; - } else { - IndexedSprite[] var4 = new IndexedSprite[class414.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class414.SpriteBuffer_spriteCount; ++var5) { - IndexedSprite var6 = var4[var5] = new IndexedSprite(); - var6.width = class414.SpriteBuffer_spriteWidth; - var6.height = class408.SpriteBuffer_spriteHeight; - var6.xOffset = class135.SpriteBuffer_xOffsets[var5]; - var6.yOffset = class131.SpriteBuffer_yOffsets[var5]; - var6.subWidth = class414.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class16.SpriteBuffer_spriteHeights[var5]; - var6.palette = class351.SpriteBuffer_spritePalette; - var6.pixels = class414.SpriteBuffer_pixels[var5]; + var1.postDecode(); // L: 79 + if (var1.isSolid) { // L: 80 + var1.interactType = 0; // L: 81 + var1.boolean1 = false; // L: 82 } - StudioGame.method5130(); - return var4; + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 + return var1; // L: 85 } } - @ObfuscatedName("q") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Loy;B)V", - garbageValue = "-40" + descriptor = "(Lav;B)V", + garbageValue = "72" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 259 + if (var0.sound != null) { // L: 260 + var0.sound.position = 0; } - } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(BI)C", - garbageValue = "395470841" - ) - public static char method2959(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class316.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; - } - - return (char)var1; + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 261 } - } - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-110" - ) - static boolean method2954() { - return (Client.drawPlayerNames & 4) != 0; - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-736812823" - ) - static void method2956() { - Client.packetWriter.addNode(LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2697, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; - } - - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "82" - ) - static void method2953() { - WorldMapDecorationType.clientPreferences.field1209 = Client.field524; - ScriptFrame.savePreferences(); - } + } // L: 262 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index ff120c08c5..ece1a99cee 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -4,433 +4,173 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kn") +@ObfuscatedName("kz") @Implements("Language") public class Language implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("td") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkz;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lkn;" + descriptor = "[Lkz;" ) @Export("Language_valuesOrdered") - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("gs") - @ObfuscatedGetter( - longValue = -4360755404150708535L - ) - static long field3800; - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("a") - final String field3795; - @ObfuscatedName("e") + static final Language[] Language_valuesOrdered; + @ObfuscatedName("p") + final String field3780; + @ObfuscatedName("j") @Export("language") final String language; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2144560303 + intValue = -1281273687 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3819, 0, "GB"); - Language_DE = new Language("DE", "de", "German", ModeWhere.field3819, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3819, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3819, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3806, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3806, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3819, 6, "MX"); - Language[] var0 = method5480(); - Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; + Language_EN = new Language("EN", "en", "English", ModeWhere.field3803, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field3803, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3803, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3803, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3793, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3793, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3803, 6, "MX"); // L: 16 + Language[] var0 = new Language[]{Language_DE, Language_NL, Language_EN, Language_ES, Language_PT, Language_FR, Language_ES_MX}; // L: 25 + Language_valuesOrdered = new Language[var0.length]; // L: 28 + Language[] var2 = var0; // L: 30 - for (int var2 = 0; var2 < var1.length; ++var2) { - Language var3 = var1[var2]; - if (Language_valuesOrdered[var3.id] != null) { - throw new IllegalStateException(); + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + Language var4 = var2[var3]; // L: 32 + if (Language_valuesOrdered[var4.id] != null) { // L: 34 + throw new IllegalStateException(); // L: 35 } - Language_valuesOrdered[var3.id] = var3; + Language_valuesOrdered[var4.id] = var4; // L: 37 } - } + } // L: 41 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkw;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lks;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3795 = var1; - this.language = var2; - this.id = var5; - if (var6 != null) { - new Locale(var2.substring(0, 2), var6); + this.field3780 = var1; // L: 44 + this.language = var2; // L: 45 + this.id = var5; // L: 46 + if (var6 != null) { // L: 47 + new Locale(var2.substring(0, 2), var6); // L: 48 } else { - new Locale(var2.substring(0, 2)); + new Locale(var2.substring(0, 2)); // L: 51 } - } + } // L: 53 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "661199397" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1696115711" + garbageValue = "-157236574" ) @Export("getLanguage") String getLanguage() { - return this.language; + return this.language; // L: 56 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "238732485" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 60 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;I)V", - garbageValue = "2092460301" + descriptor = "(III)I", + garbageValue = "2088906583" ) - public static void method5481(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; + public static int method5533(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 24 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "119" + descriptor = "(IB)Lkz;", + garbageValue = "60" ) - public static String method5476(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); + public static Language method5519(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 + } - 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 = MilliClock.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-88" + ) + static final boolean method5521() { + return Client.isMenuOpen; // L: 8105 + } - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "440428579" + ) + static final void method5516(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8109 + 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: 8110 + Client.field553[var4] = true; } } - return var2.toString(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "490898244" - ) - public static void method5469() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-287211776" - ) - static int method5477(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)[Lkn;", - garbageValue = "-1453856836" - ) - static Language[] method5480() { - return new Language[]{Language_NL, Language_PT, Language_DE, Language_ES, Language_EN, Language_ES_MX, Language_FR}; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1578017093" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-669861290" - ) - static int method5478(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]); - return 1; - } else { - --class54.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var4.parent = ViewportMouse.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var5 = 10; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]}; - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]}; - class134.Widget_setKey(var4, var5, var8, var9); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - class117.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class117.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - class322.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class322.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var10 = null; - var8 = null; - if (var3) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + AbstractByteArrayCopier.Interpreter_intStackSize] >= 0; var7 += 2) { - } - - if (var7 > 0) { - var10 = new byte[var7 / 2]; - var8 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + AbstractByteArrayCopier.Interpreter_intStackSize]; - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - } - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]}; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - class134.Widget_setKey(var4, var7, var10, var8); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } - } + } // L: 8112 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index fbd0779782..73a6c20390 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("mk") @Implements("Link") public class Link { - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmk;" ) @Export("previous") public Link previous; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmk;" ) @Export("next") public Link next; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("remove") public void remove() { - if (this.next != null) { - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; + 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 } - } + } // L: 13 } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index df9533bf27..f61e6dfbef 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,73 +3,73 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("ky") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmk;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmk;" ) @Export("current") Link current; public LinkDeque() { - this.sentinel = new Link(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Link(); // L: 6 + this.sentinel.previous = this.sentinel; // L: 10 + this.sentinel.next = this.sentinel; // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmq;)V" + descriptor = "(Lmk;)V" ) @Export("addFirst") public void addFirst(Link var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 15 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } + 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 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lmq;" + descriptor = "()Lmk;" ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return null; + Link var1 = this.sentinel.previous; // L: 23 + if (var1 == this.sentinel) { // L: 24 + this.current = null; // L: 25 + return null; // L: 26 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 28 + return var1; // L: 29 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lmq;" + descriptor = "()Lmk;" ) @Export("previous") public Link previous() { - Link var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + Link var1 = this.current; // L: 33 + if (var1 == this.sentinel) { // L: 34 + this.current = null; // L: 35 + return null; // L: 36 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 38 + return var1; // L: 39 } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index f4d8f7523b..123966ad1f 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,205 +5,250 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bc") @Implements("Login") public class Login { - @ObfuscatedName("su") + @ObfuscatedName("sx") @ObfuscatedGetter( - intValue = 1480284863 + intValue = -1142922893 ) - static int field906; - @ObfuscatedName("q") + static int field888; + @ObfuscatedName("w") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -14906911 + intValue = 1881631583 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loe;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loe;" ) - static IndexedSprite field873; + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Loe;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loe;" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("i") + static IndexedSprite field854; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loe;" ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("v") + static IndexedSprite field868; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loz;" - ) - static IndexedSprite field876; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - static IndexedSprite field877; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lcl;" + descriptor = "Lcj;" ) @Export("loginScreenRunesAnimation") static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 583338115 + intValue = 797188883 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1550771085 + intValue = -1992009983 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1093783929 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1565942121 + intValue = -363966187 ) - static int field884; - @ObfuscatedName("aj") + static int field866; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 439157501 + intValue = 145692399 ) - static int field869; - @ObfuscatedName("am") - static String field894; - @ObfuscatedName("ae") + static int field865; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -241225043 + intValue = -1403617165 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("af") + @ObfuscatedName("ay") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("bz") + @ObfuscatedName("bg") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @Export("Login_username") static String Login_username; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("Login_password") static String Login_password; - @ObfuscatedName("bm") - static boolean field904; - @ObfuscatedName("bv") - static boolean field895; - @ObfuscatedName("bb") - static boolean field900; - @ObfuscatedName("bh") + @ObfuscatedName("br") + static boolean field873; + @ObfuscatedName("bj") + static boolean field860; + @ObfuscatedName("bu") + static boolean field875; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -585931493 + intValue = 1227235195 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("be") + @ObfuscatedName("bp") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("ct") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1479872751 + intValue = -1790436313 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("cy") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 1321055669 + intValue = 1898699407 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("cg") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 109893835 + intValue = -1924078953 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("cx") + @ObfuscatedName("cn") @ObfuscatedGetter( - longValue = 554376868223177391L + longValue = 499385346435017525L ) - static long field885; + static long field876; + @ObfuscatedName("ct") + @ObfuscatedGetter( + longValue = 5345571883375832633L + ) + static long field884; @ObfuscatedName("cd") + static String[] field885; + @ObfuscatedName("cj") + static String[] field871; + @ObfuscatedName("dk") @ObfuscatedGetter( - longValue = -2022270398878791713L + longValue = -5916182875581069641L ) - static long field905; - @ObfuscatedName("cp") - static String[] field890; - @ObfuscatedName("cl") - static String[] field907; + static long field889; + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("fontBold12") + static Font fontBold12; static { - xPadding = 0; - loginBoxX = xPadding + 202; + xPadding = 0; // L: 39 + loginBoxX = xPadding + 202; // L: 58 Login_loadingPercent = 10; Login_loadingText = ""; - field884 = -1; - field869 = 1; - loginIndex = 0; - Login_response0 = ""; - Login_response1 = ""; - Login_response2 = ""; - Login_response3 = ""; - Login_username = ""; - Login_password = ""; - field904 = false; - field895 = false; - field900 = true; + field866 = -1; // L: 79 + field865 = 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 + field873 = false; // L: 99 + field860 = false; + field875 = true; currentLoginField = 0; worldSelectOpen = false; - hoveredWorldIndex = -1; - worldSelectPage = 0; - worldSelectPagesCount = 0; - new DecimalFormat("##0.00"); + hoveredWorldIndex = -1; // L: 116 + worldSelectPage = 0; // L: 117 + worldSelectPagesCount = 0; // L: 118 + new DecimalFormat("##0.00"); // L: 121 new class111(); - field885 = -1L; - field905 = -1L; - field890 = new String[]{"title.jpg"}; - field907 = 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"}; + field876 = -1L; // L: 129 + field884 = -1L; // L: 130 + field885 = new String[]{"title.jpg"}; // L: 133 + field871 = 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("i") + @ObfuscatedSignature( + descriptor = "(I)[Lcr;", + garbageValue = "814491633" + ) + static AttackOption[] method1950() { + return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1228, AttackOption.field1226}; // L: 12072 } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-235084475" + garbageValue = "485926741" ) - static void method1930() { - if (Login_username == null || Login_username.length() <= 0) { - if (WorldMapDecorationType.clientPreferences.rememberedUsername != null) { - Login_username = WorldMapDecorationType.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 100 + + try { + var0 = DevicePcmPlayerProvider.getPreferencesFile("", RouteStrategy.field1986.name, true); // L: 102 + Buffer var1 = class408.clientPreferences.toBuffer(); // L: 103 + var0.write(var1.array, 0, var1.offset); // L: 104 + } catch (Exception var3) { // L: 106 + } + + try { + if (var0 != null) { // L: 108 + var0.closeSync(true); // L: 109 + } + } catch (Exception var2) { // L: 112 + } + + } // L: 113 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-126" + ) + static void method1952() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 59 + if (ArchiveDiskActionHandler.field3662 == 0) { // L: 60 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 61 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 62 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 63 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 64 } + ArchiveDiskActionHandler.field3662 = 600; // L: 66 } - } + } // L: 68 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index a4572ce610..4b8a434981 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -3,336 +3,111 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ip") +@ObfuscatedName("im") @Implements("LoginPacket") public class LoginPacket implements class238 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Lim;" ) - public static final LoginPacket field2885; - @ObfuscatedName("q") + public static final LoginPacket field2901; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Lim;" ) - static final LoginPacket field2884; - @ObfuscatedName("f") + static final LoginPacket field2897; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Lim;" ) - public static final LoginPacket field2891; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - public static final LoginPacket field2886; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - public static final LoginPacket field2888; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - static final LoginPacket field2889; + public static final LoginPacket field2896; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lip;" + descriptor = "Lim;" + ) + public static final LoginPacket field2894; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lim;" + ) + public static final LoginPacket field2900; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lim;" + ) + static final LoginPacket field2899; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "[Lim;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Len;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1335807315 + intValue = -152367843 ) @Export("id") public final int id; static { - field2885 = new LoginPacket(14, 0); - field2884 = new LoginPacket(15, 4); - field2891 = new LoginPacket(16, -2); - field2886 = new LoginPacket(18, -2); - field2888 = new LoginPacket(19, -2); - field2889 = new LoginPacket(27, 0); - LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = ModelData0.method4562(); + field2901 = new LoginPacket(14, 0); // L: 5 + field2897 = new LoginPacket(15, 4); // L: 6 + field2896 = new LoginPacket(16, -2); // L: 7 + field2894 = new LoginPacket(18, -2); // L: 8 + field2900 = new LoginPacket(19, -2); // L: 9 + field2899 = new LoginPacket(27, 0); // L: 10 + LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 + LoginPacket[] var0 = class240.method4711(); // L: 15 - for (int var1 = 0; var1 < var0.length; ++var1) { - LoginPacket_indexedValues[var0[var1].id] = var0[var1]; + for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 + LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 } - } + } // L: 19 @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; - } + this.id = var1; // L: 26 + } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("jf") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "66089892" + descriptor = "(Ljf;IIB)V", + garbageValue = "8" ) - static int method4659(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10279 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10280 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10281 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10282 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10283 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; } else { - return 2; + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10284 } - } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "-55" - ) - static int method4660(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - MusicPatchNode2.privateChatMode = class129.method2671(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - if (MusicPatchNode2.privateChatMode == null) { - MusicPatchNode2.privateChatMode = PrivateChatMode.field4411; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - PacketBufferNode var13 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2749, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(Client.publicChatMode); - var13.packetBuffer.writeByte(MusicPatchNode2.privateChatMode.field4414); - var13.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var13); - return 1; + if (var0.yAlignment == 0) { // L: 10285 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10286 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10287 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10288 + } else if (var0.yAlignment == 4) { // L: 10289 + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var8 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var6 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2758, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class113.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) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = HitSplatDefinition.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class301.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (MusicPatchNode2.privateChatMode == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = MusicPatchNode2.privateChatMode.field4414; - } - - return 1; - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var8 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var12 = HitSplatDefinition.method3197(var7, var8, ReflectionCheck.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - class54.Interpreter_stringStackSize -= 2; - var8 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - String var11 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2735, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var8); - class157.method2985(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[--class54.Interpreter_stringStackSize]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var6 = HitSplatDefinition.method3197(var7, var8, ReflectionCheck.clientLanguage, var9); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class124.Messages_getHistorySize(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Tiles.Messages_getLastChatID(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = DirectByteArrayCopier.method5102(var3); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var8 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - UserComparator6.doCheat(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field550 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = Client.field550; - return 1; - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { - var8 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - System.out.println(var8); - return 1; - } else if (var0 == 5024) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 5025) { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 5030) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = HitSplatDefinition.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class301.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (class67.localPlayer != null && class67.localPlayer.username != null) { - var8 = class67.localPlayer.username.getName(); - } else { - var8 = ""; - } - - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var8; - return 1; - } - } - } - } + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10290 } - } + + } // L: 10291 } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 1810c01642..938be49734 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,541 +4,560 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cj") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("jn") - @ObfuscatedGetter( - intValue = -1564481285 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("lu") - @ObfuscatedGetter( - intValue = 692810023 - ) - @Export("menuX") - static int menuX; - @ObfuscatedName("l") + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "Lkd;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("hq") + @Export("regions") + static int[] regions; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Loe;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("t") - int[] field1177; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1281990765 - ) - int field1181; @ObfuscatedName("e") - int[] field1190; - @ObfuscatedName("i") - int[] field1179; - @ObfuscatedName("y") - int[] field1180; - @ObfuscatedName("w") - int[] field1182; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -32130277 - ) - int field1183; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -464579847 - ) - int field1191; - @ObfuscatedName("s") - int[] field1175; - @ObfuscatedName("c") - int[] field1186; - @ObfuscatedName("b") - int[] field1187; - @ObfuscatedName("x") - int[] field1188; + int[] field1160; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1357468819 + intValue = 61106321 ) - int field1189; + int field1158; + @ObfuscatedName("j") + int[] field1159; + @ObfuscatedName("b") + int[] field1175; + @ObfuscatedName("x") + int[] field1171; + @ObfuscatedName("y") + int[] field1162; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1713557939 + ) + int field1163; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1441778183 + ) + int field1164; + @ObfuscatedName("l") + int[] field1157; + @ObfuscatedName("u") + int[] field1161; + @ObfuscatedName("n") + int[] field1166; @ObfuscatedName("z") + int[] field1168; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -12695433 + intValue = -1420414455 ) - int field1178; - @ObfuscatedName("h") + int field1169; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -509899335 + intValue = 1836018091 ) - int field1176; + int field1170; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1971523537 + ) + int field1172; @ObfuscatedSignature( - descriptor = "([Loz;)V" + descriptor = "([Loe;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1177 = new int[256]; - this.field1181 = 0; - this.field1183 = 0; - this.field1191 = 0; - this.field1189 = 0; - this.field1178 = 0; - this.field1176 = 0; - this.sprites = var1; - this.initColors(); - } + this.field1160 = new int[256]; + this.field1158 = 0; // L: 14 + this.field1163 = 0; + this.field1164 = 0; + this.field1169 = 0; // L: 25 + this.field1170 = 0; // L: 26 + this.field1172 = 0; // L: 27 + this.sprites = var1; // L: 30 + this.initColors(); // L: 31 + } // L: 32 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1243250629" + garbageValue = "-1711937490" ) @Export("initColors") void initColors() { - this.field1179 = new int[256]; + this.field1175 = new int[256]; // L: 35 int var1; - for (var1 = 0; var1 < 64; ++var1) { - this.field1179[var1] = var1 * 262144; + for (var1 = 0; var1 < 64; ++var1) { // L: 36 + this.field1175[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1179[var1 + 64] = var1 * 1024 + 16711680; + this.field1175[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1179[var1 + 128] = var1 * 4 + 16776960; + this.field1175[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1179[var1 + 192] = 16777215; + this.field1175[var1 + 192] = 16777215; } - this.field1180 = new int[256]; + this.field1171 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1180[var1] = var1 * 1024; + this.field1171[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1180[var1 + 64] = var1 * 4 + 65280; + this.field1171[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1180[var1 + 128] = var1 * 262144 + 65535; + this.field1171[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1180[var1 + 192] = 16777215; + this.field1171[var1 + 192] = 16777215; } - this.field1182 = new int[256]; + this.field1162 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1182[var1] = var1 * 4; + this.field1162[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1182[var1 + 64] = var1 * 262144 + 255; + this.field1162[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1182[var1 + 128] = var1 * 1024 + 16711935; + this.field1162[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1182[var1 + 192] = 16777215; + this.field1162[var1 + 192] = 16777215; } - this.field1190 = new int[256]; - this.field1189 = 0; - this.field1187 = new int[32768]; - this.field1188 = new int[32768]; - this.method2193((IndexedSprite)null); - this.field1175 = new int[32768]; - this.field1186 = new int[32768]; + this.field1159 = new int[256]; + this.field1169 = 0; + this.field1166 = new int[32768]; + this.field1168 = new int[32768]; + this.method2189((IndexedSprite)null); + this.field1157 = new int[32768]; + this.field1161 = new int[32768]; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1823287172" + descriptor = "(B)V", + garbageValue = "-6" ) - void method2164() { - this.field1179 = null; - this.field1180 = null; - this.field1182 = null; - this.field1190 = null; - this.field1187 = null; - this.field1188 = null; + void method2193() { this.field1175 = null; - this.field1186 = null; - this.field1189 = 0; - this.field1178 = 0; - } + this.field1171 = null; + this.field1162 = null; + this.field1159 = null; + this.field1166 = null; + this.field1168 = null; + this.field1157 = null; // L: 66 + this.field1161 = null; + this.field1169 = 0; + this.field1170 = 0; // L: 69 + } // L: 70 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2074439873" + garbageValue = "1838202264" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1175 == null) { - this.initColors(); + if (this.field1157 == null) { // L: 73 + this.initColors(); // L: 74 } - if (this.field1176 == 0) { - this.field1176 = var2; + if (this.field1172 == 0) { // L: 76 + this.field1172 = var2; // L: 77 } - int var3 = var2 - this.field1176; - if (var3 >= 256) { + int var3 = var2 - this.field1172; // L: 79 + if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1176 = var2; - if (var3 > 0) { - this.method2180(var3); + this.field1172 = var2; // L: 81 + if (var3 > 0) { // L: 82 + this.method2190(var3); // L: 83 } - this.method2168(var1); - } + this.method2192(var1); // L: 85 + } // L: 86 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "162428654" + garbageValue = "-2115412398" ) - final void method2180(int var1) { - this.field1189 += 128 * var1; + final void method2190(int var1) { + this.field1169 += 128 * var1; // L: 89 int var2; - if (this.field1189 > this.field1187.length) { - this.field1189 -= this.field1187.length; - var2 = (int)(Math.random() * 12.0D); - this.method2193(this.sprites[var2]); + if (this.field1169 > this.field1166.length) { // L: 90 + this.field1169 -= this.field1166.length; // L: 91 + var2 = (int)(Math.random() * 12.0D); // L: 92 + this.method2189(this.sprites[var2]); // L: 93 } - var2 = 0; - int var3 = var1 * 128; - int var4 = (256 - var1) * 128; + var2 = 0; // L: 95 + int var3 = var1 * 128; // L: 96 + int var4 = (256 - var1) * 128; // L: 97 int var6; - for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1175[var3 + var2] - this.field1187[var2 + this.field1189 & this.field1187.length - 1] * var1 / 6; - if (var6 < 0) { + for (int var5 = 0; var5 < var4; ++var5) { // L: 98 + var6 = this.field1157[var3 + var2] - this.field1166[var2 + this.field1169 & this.field1166.length - 1] * var1 / 6; // L: 99 + if (var6 < 0) { // L: 100 var6 = 0; } - this.field1175[var2++] = var6; + this.field1157[var2++] = var6; // L: 101 } - byte var15 = 10; - var6 = 128 - var15; + byte var15 = 10; // L: 103 + var6 = 128 - var15; // L: 104 int var7; int var10; - for (var7 = 256 - var1; var7 < 256; ++var7) { - int var8 = var7 * 128; + for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 105 + int var8 = var7 * 128; // L: 106 - for (int var9 = 0; var9 < 128; ++var9) { - var10 = (int)(Math.random() * 100.0D); - if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1175[var8 + var9] = 255; + for (int var9 = 0; var9 < 128; ++var9) { // L: 107 + var10 = (int)(Math.random() * 100.0D); // L: 108 + if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 + this.field1157[var8 + var9] = 255; } else { - this.field1175[var9 + var8] = 0; + this.field1157[var8 + var9] = 0; // L: 110 } } } - if (this.field1183 > 0) { - this.field1183 -= var1 * 4; + if (this.field1163 > 0) { // L: 113 + this.field1163 -= var1 * 4; } - if (this.field1191 > 0) { - this.field1191 -= var1 * 4; + if (this.field1164 > 0) { // L: 114 + this.field1164 -= var1 * 4; } - if (this.field1183 == 0 && this.field1191 == 0) { - var7 = (int)(Math.random() * (double)(2000 / var1)); - if (var7 == 0) { - this.field1183 = 1024; + if (this.field1163 == 0 && this.field1164 == 0) { // L: 115 + var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 + if (var7 == 0) { // L: 117 + this.field1163 = 1024; } - if (var7 == 1) { - this.field1191 = 1024; + if (var7 == 1) { // L: 118 + this.field1164 = 1024; } } - for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1177[var7] = this.field1177[var7 + var1]; + for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 + this.field1160[var7] = this.field1160[var7 + var1]; } - for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1177[var7] = (int)(Math.sin((double)this.field1181 / 14.0D) * 16.0D + Math.sin((double)this.field1181 / 15.0D) * 14.0D + Math.sin((double)this.field1181 / 16.0D) * 12.0D); - ++this.field1181; + for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 + this.field1160[var7] = (int)(Math.sin((double)this.field1158 / 14.0D) * 16.0D + Math.sin((double)this.field1158 / 15.0D) * 14.0D + Math.sin((double)this.field1158 / 16.0D) * 12.0D); // L: 122 + ++this.field1158; // L: 123 } - this.field1178 += var1; - var7 = ((Client.cycle & 1) + var1) / 2; - if (var7 > 0) { - short var16 = 128; - byte var17 = 2; - var10 = 128 - var17 - var17; + this.field1170 += var1; // L: 125 + 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 int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1178 * 100; ++var11) { - var12 = (int)(Math.random() * (double)var10) + var17; - var13 = (int)(Math.random() * (double)var16) + var16; - this.field1175[var12 + (var13 << 7)] = 192; + for (var11 = 0; var11 < this.field1170 * 100; ++var11) { // L: 131 + var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 + var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 + this.field1157[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1178 = 0; + this.field1170 = 0; // L: 136 int var14; - for (var11 = 0; var11 < 256; ++var11) { - var12 = 0; - var13 = var11 * 128; + for (var11 = 0; var11 < 256; ++var11) { // L: 137 + var12 = 0; // L: 138 + var13 = var11 * 128; // L: 139 - for (var14 = -var7; var14 < 128; ++var14) { - if (var7 + var14 < 128) { - var12 += this.field1175[var14 + var13 + var7]; + for (var14 = -var7; var14 < 128; ++var14) { // L: 140 + if (var14 + var7 < 128) { // L: 141 + var12 += this.field1157[var13 + var14 + var7]; } - if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1175[var13 + var14 - (var7 + 1)]; + if (var14 - (var7 + 1) >= 0) { // L: 142 + var12 -= this.field1157[var13 + var14 - (var7 + 1)]; } - if (var14 >= 0) { - this.field1186[var14 + var13] = var12 / (var7 * 2 + 1); + if (var14 >= 0) { // L: 143 + this.field1161[var14 + var13] = var12 / (var7 * 2 + 1); } } } - for (var11 = 0; var11 < 128; ++var11) { - var12 = 0; + for (var11 = 0; var11 < 128; ++var11) { // L: 146 + var12 = 0; // L: 147 - for (var13 = -var7; var13 < 256; ++var13) { - var14 = var13 * 128; - if (var13 + var7 < 256) { - var12 += this.field1186[var11 + var14 + var7 * 128]; + for (var13 = -var7; var13 < 256; ++var13) { // L: 148 + var14 = var13 * 128; // L: 149 + if (var13 + var7 < 256) { // L: 150 + var12 += this.field1161[var7 * 128 + var14 + var11]; } - if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1186[var11 + var14 - (var7 + 1) * 128]; + if (var13 - (var7 + 1) >= 0) { // L: 151 + var12 -= this.field1161[var11 + var14 - (var7 + 1) * 128]; } - if (var13 >= 0) { - this.field1175[var14 + var11] = var12 / (var7 * 2 + 1); + if (var13 >= 0) { // L: 152 + this.field1157[var11 + var14] = var12 / (var7 * 2 + 1); } } } } - } + } // L: 156 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-2100296375" + garbageValue = "1812147314" ) - final int method2167(int var1, int var2, int var3) { - int var4 = 256 - var3; - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; + final int method2221(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 } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-20" - ) - final void method2168(int var1) { - int var2 = this.field1190.length; - if (this.field1183 > 0) { - this.method2169(this.field1183, this.field1180); - } else if (this.field1191 > 0) { - this.method2169(this.field1191, this.field1182); - } else { - for (int var3 = 0; var3 < var2; ++var3) { - this.field1190[var3] = this.field1179[var3]; - } - } - - this.method2170(var1); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I[II)V", - garbageValue = "762418609" - ) - final void method2169(int var1, int[] var2) { - int var3 = this.field1190.length; - - for (int var4 = 0; var4 < var3; ++var4) { - if (var1 > 768) { - this.field1190[var4] = this.method2167(this.field1179[var4], var2[var4], 1024 - var1); - } else if (var1 > 256) { - this.field1190[var4] = var2[var4]; - } else { - this.field1190[var4] = this.method2167(var2[var4], this.field1179[var4], 256 - var1); - } - } - - } - - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1989037635" + garbageValue = "-1372694811" ) - final void method2170(int var1) { - int var2 = 0; - - 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; + final void method2192(int var1) { + int var2 = this.field1159.length; // L: 164 + if (this.field1163 > 0) { // L: 165 + this.method2195(this.field1163, this.field1171); // L: 166 + } else if (this.field1164 > 0) { // L: 168 + this.method2195(this.field1164, this.field1162); // L: 169 + } else { + for (int var3 = 0; var3 < var2; ++var3) { // L: 172 + this.field1159[var3] = this.field1175[var3]; } - - if (var5 + 128 >= class244.rasterProvider.width) { - var7 = class244.rasterProvider.width - var5; - } - - int var8 = var5 + (var3 + 8) * class244.rasterProvider.width; - var2 += var6; - - for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1175[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.field1190[var10]; - int var14 = class244.rasterProvider.pixels[var8]; - class244.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; - } else { - ++var8; - } - } - - var2 += 128 - var7; } - } + this.method2194(var1); // L: 174 + } // L: 175 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Loz;I)V", - garbageValue = "1396461999" + descriptor = "(I[II)V", + garbageValue = "-668681605" ) - final void method2193(IndexedSprite var1) { + final void method2195(int var1, int[] var2) { + int var3 = this.field1159.length; // L: 178 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 179 + if (var1 > 768) { // L: 180 + this.field1159[var4] = this.method2221(this.field1175[var4], var2[var4], 1024 - var1); + } else if (var1 > 256) { + this.field1159[var4] = var2[var4]; // L: 181 + } else { + this.field1159[var4] = this.method2221(var2[var4], this.field1175[var4], 256 - var1); // L: 182 + } + } + + } // L: 184 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1898388799" + ) + final void method2194(int var1) { + int var2 = 0; // L: 187 + + for (int var3 = 1; var3 < 255; ++var3) { // L: 188 + int var4 = (256 - var3) * this.field1160[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 + } + + if (var5 + 128 >= Canvas.rasterProvider.width) { // L: 197 + var7 = Canvas.rasterProvider.width - var5; // L: 198 + } + + int var8 = var5 + (var3 + 8) * Canvas.rasterProvider.width; // L: 200 + var2 += var6; // L: 201 + + for (int var9 = var6; var9 < var7; ++var9) { // L: 202 + int var10 = this.field1157[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.field1159[var10]; // L: 208 + int var14 = Canvas.rasterProvider.pixels[var8]; // L: 209 + Canvas.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 + } else { + ++var8; // L: 212 + } + } + + var2 += 128 - var7; // L: 214 + } + + } // L: 216 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Loe;I)V", + garbageValue = "-1097319599" + ) + final void method2189(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1187.length; ++var2) { - this.field1187[var2] = 0; + for (var2 = 0; var2 < this.field1166.length; ++var2) { // L: 219 + this.field1166[var2] = 0; } int var3; - for (var2 = 0; var2 < 5000; ++var2) { - var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1187[var3] = (int)(Math.random() * 256.0D); + for (var2 = 0; var2 < 5000; ++var2) { // L: 220 + var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 + this.field1166[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; int var5; - for (var2 = 0; var2 < 20; ++var2) { - for (var3 = 1; var3 < 255; ++var3) { - for (var4 = 1; var4 < 127; ++var4) { - var5 = var4 + (var3 << 7); - this.field1188[var5] = (this.field1187[var5 + 1] + this.field1187[var5 - 128] + this.field1187[var5 + 128] + this.field1187[var5 - 1]) / 4; + 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.field1168[var5] = (this.field1166[var5 - 128] + this.field1166[var5 + 1] + this.field1166[var5 + 128] + this.field1166[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1187; - this.field1187 = this.field1188; - this.field1188 = var8; + int[] var8 = this.field1166; // L: 231 + this.field1166 = this.field1168; // L: 232 + this.field1168 = var8; // L: 233 } - if (var1 != null) { - var2 = 0; + if (var1 != null) { // L: 235 + var2 = 0; // L: 236 - 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.field1187[var7] = 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.field1166[var7] = 0; // L: 243 } } } } - } + } // L: 248 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Liz;Lpv;B)Lis;", - garbageValue = "50" + descriptor = "(IIIB)I", + garbageValue = "-30" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = Tile.method4117(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); + static int method2218(int var0, int var1, int var2) { + if (var2 > 179) { // L: 15 + var1 /= 2; } - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; + if (var2 > 192) { // L: 16 + var1 /= 2; + } + + if (var2 > 217) { // L: 17 + var1 /= 2; + } + + if (var2 > 243) { // L: 18 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 19 + return var3; // L: 20 } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZB)V", - garbageValue = "-38" + descriptor = "(Loj;I)V", + garbageValue = "1922464614" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - class126.method2580(var0, var1, "openjs", var2); - } + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = HealthBarDefinition.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 - class19.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - DefaultsGroup.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + GrandExchangeOfferTotalQuantityComparator.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1242[var1] != null) { // L: 50 + var2.read(Players.field1242[var1]); + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "7" - ) - public static void method2175() { - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); - } + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1244[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 - @ObfuscatedName("ag") + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var7 != var1) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1244[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "470169586" + descriptor = "(III)I", + garbageValue = "-2058131323" ) - public static int method2192(byte[] var0, int var1) { - return IgnoreList.method5946(var0, 0, var1); + public static int method2220(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 352531d6c3..bf425a1547 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,161 +4,721 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +@ObfuscatedName("ni") @Implements("LoginType") public class LoginType { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lny;" - ) - static final LoginType field4221; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static final LoginType field4226; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static final LoginType field4222; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static final LoginType field4223; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) static final LoginType field4224; - @ObfuscatedName("t") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) - static final LoginType field4225; + static final LoginType field4232; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" + ) + static final LoginType field4226; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + static final LoginType field4227; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lni;" ) static final LoginType field4228; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lni;" ) - public static final LoginType field4227; - @ObfuscatedName("i") + static final LoginType field4233; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + static final LoginType field4230; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public static final LoginType field4231; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1281565655 + intValue = 454299659 ) final int field4229; - @ObfuscatedName("y") - final String field4220; + @ObfuscatedName("x") + final String field4223; static { - oldscape = new LoginType(8, 0, "", ""); - field4221 = new LoginType(3, 1, "", ""); - field4226 = new LoginType(5, 2, "", ""); - field4222 = new LoginType(2, 3, "", ""); - field4223 = new LoginType(0, 4, "", ""); - field4224 = new LoginType(6, 5, "", ""); - field4225 = new LoginType(7, 6, "", ""); - field4228 = new LoginType(1, 7, "", ""); - field4227 = new LoginType(4, -1, "", "", true, new LoginType[]{oldscape, field4221, field4226, field4223, field4222}); + oldscape = new LoginType(0, 0, "", ""); // L: 5 + field4224 = new LoginType(8, 1, "", ""); // L: 6 + field4232 = new LoginType(7, 2, "", ""); // L: 7 + field4226 = new LoginType(4, 3, "", ""); // L: 8 + field4227 = new LoginType(1, 4, "", ""); // L: 9 + field4228 = new LoginType(2, 5, "", ""); // L: 10 + field4233 = new LoginType(6, 6, "", ""); // L: 11 + field4230 = new LoginType(5, 7, "", ""); // L: 12 + field4231 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4224, field4232, field4227, field4226}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4229 = var1; - this.field4220 = var4; - } + this.field4229 = var1; // L: 18 + this.field4223 = var4; // L: 19 + } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lny;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lni;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4229 = var1; - this.field4220 = var4; - } + this.field4229 = var1; // L: 23 + this.field4223 = var4; // L: 24 + } // L: 25 public String toString() { - return this.field4220; + return this.field4223; // L: 28 } - @ObfuscatedName("q") + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Z", - garbageValue = "0" + descriptor = "(Lct;IIIIII)V", + garbageValue = "205467401" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; - boolean var3 = false; - int var4 = 0; - int var5 = var0.length(); - int var6 = 0; - - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; - break; - } - - label84: { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - break label84; - } - - if (var7 == '+') { - break label84; - } + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 5132 + if (var0 instanceof NPC) { // L: 5133 + NPCComposition var6 = ((NPC)var0).definition; // L: 5134 + if (var6.transforms != null) { // L: 5135 + var6 = var6.transform(); } - int var9; - if (var7 >= '0' && var7 <= '9') { - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { - var9 = var7 - '7'; + if (var6 == null) { // L: 5136 + return; + } + } + + int var76 = Players.Players_count; // L: 5138 + int[] var7 = Players.Players_indices; // L: 5139 + byte var8 = 0; // L: 5140 + Player var10; + int var92; + if (var1 < var76 && var0.playerCycle == Client.cycle) { // L: 5141 + var10 = (Player)var0; // L: 5143 + boolean var9; + if (Client.drawPlayerNames == 0) { // L: 5145 + var9 = false; // L: 5146 } else { - if (var7 < 'a' || var7 > 'z') { - var1 = false; - break; + boolean var11; + if (var10 != HealthBarDefinition.localPlayer) { // L: 5149 + var11 = (Client.drawPlayerNames & 4) != 0; // L: 5152 + boolean var12 = var11; // L: 5154 + if (!var11) { // L: 5155 + boolean var13 = (Client.drawPlayerNames & 1) != 0; // L: 5158 + var12 = var13 && var10.isFriend(); // L: 5160 + } + + var9 = var12 || Message.method1147() && var10.isFriendsChatMember(); // L: 5162 + } else { + var11 = (Client.drawPlayerNames & 8) != 0; // L: 5167 + var9 = var11; // L: 5169 } - - var9 = var7 - 'W'; } - if (var9 >= 10) { - var1 = false; - break; + if (var9) { // L: 5172 + Player var77 = (Player)var0; // L: 5173 + if (var1 < var76) { // L: 5174 + var92 = var0.defaultHeight + 15; // L: 5175 + DefaultsGroup.worldToScreen(var0.x, var0.y, var92); // L: 5177 + AbstractFont var78 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 5179 + byte var14 = 9; // L: 5180 + var78.drawCentered(var77.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); // L: 5181 + var8 = 18; // L: 5182 + } } - - if (var2) { - var9 = -var9; - } - - int var8 = var4 * 10 + var9; - if (var4 != var8 / 10) { - var1 = false; - break; - } - - var4 = var8; - var3 = true; } - ++var6; - } + int var89 = -2; // L: 5186 + int var17; + int var23; + int var24; + int var79; + if (!var0.healthBars.method5633()) { // L: 5187 + var79 = var0.defaultHeight + 15; // L: 5188 + DefaultsGroup.worldToScreen(var0.x, var0.y, var79); // L: 5190 - return var1; - } + for (HealthBar var95 = (HealthBar)var0.healthBars.last(); var95 != null; var95 = (HealthBar)var0.healthBars.previous()) { // L: 5192 + HealthBarUpdate var81 = var95.get(Client.cycle); // L: 5193 + if (var81 == null) { // L: 5194 + if (var95.isEmpty()) { // L: 5252 + var95.remove(); + } + } else { + HealthBarDefinition var96 = var95.definition; // L: 5195 + SpritePixels var82 = var96.getBackSprite(); // L: 5196 + SpritePixels var83 = var96.getFrontSprite(); // L: 5197 + var17 = 0; // L: 5199 + int var84; + if (var82 != null && var83 != null) { // L: 5200 + if (var96.widthPadding * 2 < var83.subWidth) { // L: 5201 + var17 = var96.widthPadding; + } + + var84 = var83.subWidth - var17 * 2; // L: 5202 + } else { + var84 = var96.width; // L: 5204 + } + + int var18 = 255; // L: 5205 + boolean var85 = true; // L: 5206 + int var86 = Client.cycle - var81.cycle; // L: 5207 + int var87 = var84 * var81.health2 / var96.width; // L: 5208 + int var88; + int var98; + if (var81.cycleOffset > var86) { // L: 5209 + var88 = var96.field1666 == 0 ? 0 : var96.field1666 * (var86 / var96.field1666); // L: 5210 + var23 = var84 * var81.health / var96.width; // L: 5211 + var98 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 5212 + } else { + var98 = var87; // L: 5215 + var88 = var81.cycleOffset + var96.int5 - var86; // L: 5216 + if (var96.int3 >= 0) { // L: 5217 + var18 = (var88 << 8) / (var96.int5 - var96.int3); + } + } + + if (var81.health2 > 0 && var98 < 1) { // L: 5219 + var98 = 1; + } + + if (var82 != null && var83 != null) { // L: 5220 + if (var98 == var84) { // L: 5221 + var98 += var17 * 2; + } else { + var98 += var17; // L: 5222 + } + + var88 = var82.subHeight; // L: 5223 + var89 += var88; // L: 5224 + var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5225 + var24 = var3 + Client.viewportTempY - var89; // L: 5226 + var23 -= var17; // L: 5227 + if (var18 >= 0 && var18 < 255) { // L: 5228 + var82.drawTransAt(var23, var24, var18); // L: 5229 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var98, var24 + var88); // L: 5230 + var83.drawTransAt(var23, var24, var18); // L: 5231 + } else { + var82.drawTransBgAt(var23, var24); // L: 5234 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var98 + var23, var88 + var24); // L: 5235 + var83.drawTransBgAt(var23, var24); // L: 5236 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5238 + var89 += 2; // L: 5239 + } else { + var89 += 5; // L: 5242 + if (Client.viewportTempX > -1) { // L: 5243 + var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5244 + var23 = var3 + Client.viewportTempY - var89; // L: 5245 + Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var98, 5, 65280); // L: 5246 + Rasterizer2D.Rasterizer2D_fillRectangle(var88 + var98, var23, var84 - var98, 5, 16711680); // L: 5247 + } + + var89 += 2; // L: 5249 + } + } + } + } + + if (var89 == -2) { // L: 5255 + var89 += 7; + } + + var89 += var8; // L: 5256 + int var91; + if (var1 < var76) { // L: 5257 + var10 = (Player)var0; // L: 5258 + if (var10.isHidden) { // L: 5259 + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5260 + var91 = var0.defaultHeight + 15; // L: 5261 + DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5263 + if (Client.viewportTempX > -1) { // L: 5265 + if (var10.headIconPk != -1) { // L: 5266 + var89 += 25; // L: 5267 + Client.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5268 + } + + if (var10.headIconPrayer != -1) { // L: 5270 + var89 += 25; // L: 5271 + ServerPacket.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5272 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5276 + var91 = var0.defaultHeight + 15; // L: 5277 + DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5279 + if (Client.viewportTempX > -1) { // L: 5281 + var89 += DevicePcmPlayerProvider.headIconHintSprites[1].subHeight; // L: 5282 + DevicePcmPlayerProvider.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5283 + } + } + } else { + NPCComposition var90 = ((NPC)var0).definition; // L: 5288 + if (var90.transforms != null) { // L: 5289 + var90 = var90.transform(); + } + + if (var90.headIconPrayer >= 0 && var90.headIconPrayer < ServerPacket.headIconPrayerSprites.length) { // L: 5290 + var91 = var0.defaultHeight + 15; // L: 5291 + DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5293 + if (Client.viewportTempX > -1) { // L: 5295 + ServerPacket.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5296 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5299 + var91 = var0.defaultHeight + 15; // L: 5300 + DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5302 + if (Client.viewportTempX > -1) { // L: 5304 + DevicePcmPlayerProvider.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var76 || !var0.field1099 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5307 5308 + var79 = var0.defaultHeight; // L: 5309 + DefaultsGroup.worldToScreen(var0.x, var0.y, var79); // L: 5311 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5313 + Client.overheadTextXOffsets[Client.overheadTextCount] = Login.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5314 + Client.overheadTextAscents[Client.overheadTextCount] = Login.fontBold12.ascent; // L: 5315 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5316 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5317 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5318 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5319 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5320 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5321 + ++Client.overheadTextCount; // L: 5322 + } + } + + for (var79 = 0; var79 < 4; ++var79) { // L: 5326 + var91 = var0.hitSplatCycles[var79]; // L: 5327 + var92 = var0.hitSplatTypes[var79]; // L: 5328 + HitSplatDefinition var97 = null; // L: 5329 + int var93 = 0; // L: 5330 + if (var92 >= 0) { // L: 5331 + if (var91 <= Client.cycle) { // L: 5332 + continue; + } + + var97 = Canvas.method372(var0.hitSplatTypes[var79]); // L: 5333 + var93 = var97.field1805; // L: 5334 + if (var97 != null && var97.transforms != null) { // L: 5335 + var97 = var97.transform(); // L: 5336 + if (var97 == null) { // L: 5337 + var0.hitSplatCycles[var79] = -1; // L: 5338 + continue; // L: 5339 + } + } + } else if (var91 < 0) { // L: 5343 + continue; + } + + int var15 = var0.hitSplatTypes2[var79]; // L: 5344 + HitSplatDefinition var16 = null; // L: 5345 + if (var15 >= 0) { // L: 5346 + var16 = Canvas.method372(var15); // L: 5347 + if (var16 != null && var16.transforms != null) { // L: 5348 + var16 = var16.transform(); + } + } + + if (var91 - var93 <= Client.cycle) { // L: 5350 + if (var97 == null) { // L: 5351 + var0.hitSplatCycles[var79] = -1; // L: 5352 + } else { + var17 = var0.defaultHeight / 2; // L: 5355 + DefaultsGroup.worldToScreen(var0.x, var0.y, var17); // L: 5357 + if (Client.viewportTempX > -1) { // L: 5359 + if (var79 == 1) { // L: 5361 + Client.viewportTempY -= 20; // L: 5362 + } + + if (var79 == 2) { // L: 5364 + Client.viewportTempX -= 15; // L: 5365 + Client.viewportTempY -= 10; // L: 5366 + } + + if (var79 == 3) { // L: 5368 + Client.viewportTempX += 15; // L: 5369 + Client.viewportTempY -= 10; // L: 5370 + } + + SpritePixels var19 = null; // L: 5372 + SpritePixels var20 = null; // L: 5373 + SpritePixels var21 = null; // L: 5374 + SpritePixels var22 = null; // L: 5375 + var23 = 0; // L: 5376 + var24 = 0; // L: 5377 + int var25 = 0; // L: 5378 + int var26 = 0; // L: 5379 + int var27 = 0; // L: 5380 + int var28 = 0; // L: 5381 + int var29 = 0; // L: 5382 + int var30 = 0; // L: 5383 + SpritePixels var31 = null; // L: 5384 + SpritePixels var32 = null; // L: 5385 + SpritePixels var33 = null; // L: 5386 + SpritePixels var34 = null; // L: 5387 + int var35 = 0; // L: 5388 + int var36 = 0; // L: 5389 + int var37 = 0; // L: 5390 + int var38 = 0; // L: 5391 + int var39 = 0; // L: 5392 + int var40 = 0; // L: 5393 + int var41 = 0; // L: 5394 + int var42 = 0; // L: 5395 + int var43 = 0; // L: 5396 + var19 = var97.method3256(); // L: 5397 + int var44; + if (var19 != null) { // L: 5398 + var23 = var19.subWidth; // L: 5399 + var44 = var19.subHeight; // L: 5400 + if (var44 > var43) { // L: 5401 + var43 = var44; + } + + var27 = var19.xOffset; // L: 5402 + } + + var20 = var97.method3286(); // L: 5404 + if (var20 != null) { // L: 5405 + var24 = var20.subWidth; // L: 5406 + var44 = var20.subHeight; // L: 5407 + if (var44 > var43) { // L: 5408 + var43 = var44; + } + + var28 = var20.xOffset; // L: 5409 + } + + var21 = var97.method3258(); // L: 5411 + if (var21 != null) { // L: 5412 + var25 = var21.subWidth; // L: 5413 + var44 = var21.subHeight; // L: 5414 + if (var44 > var43) { // L: 5415 + var43 = var44; + } + + var29 = var21.xOffset; // L: 5416 + } + + var22 = var97.method3281(); // L: 5418 + if (var22 != null) { // L: 5419 + var26 = var22.subWidth; // L: 5420 + var44 = var22.subHeight; // L: 5421 + if (var44 > var43) { // L: 5422 + var43 = var44; + } + + var30 = var22.xOffset; // L: 5423 + } + + if (var16 != null) { // L: 5425 + var31 = var16.method3256(); // L: 5426 + if (var31 != null) { // L: 5427 + var35 = var31.subWidth; // L: 5428 + var44 = var31.subHeight; // L: 5429 + if (var44 > var43) { // L: 5430 + var43 = var44; + } + + var39 = var31.xOffset; // L: 5431 + } + + var32 = var16.method3286(); // L: 5433 + if (var32 != null) { // L: 5434 + var36 = var32.subWidth; // L: 5435 + var44 = var32.subHeight; // L: 5436 + if (var44 > var43) { // L: 5437 + var43 = var44; + } + + var40 = var32.xOffset; // L: 5438 + } + + var33 = var16.method3258(); // L: 5440 + if (var33 != null) { // L: 5441 + var37 = var33.subWidth; // L: 5442 + var44 = var33.subHeight; // L: 5443 + if (var44 > var43) { // L: 5444 + var43 = var44; + } + + var41 = var33.xOffset; // L: 5445 + } + + var34 = var16.method3281(); // L: 5447 + if (var34 != null) { // L: 5448 + var38 = var34.subWidth; // L: 5449 + var44 = var34.subHeight; // L: 5450 + if (var44 > var43) { // L: 5451 + var43 = var44; + } + + var42 = var34.xOffset; // L: 5452 + } + } + + Font var80 = var97.getFont(); // L: 5457 + if (var80 == null) { // L: 5458 + var80 = FriendLoginUpdate.fontPlain11; + } + + Font var45; + if (var16 != null) { // L: 5459 + var45 = var16.getFont(); // L: 5460 + if (var45 == null) { // L: 5461 + var45 = FriendLoginUpdate.fontPlain11; + } + } else { + var45 = FriendLoginUpdate.fontPlain11; // L: 5463 + } + + String var46 = null; // L: 5464 + String var47 = null; // L: 5465 + boolean var48 = false; // L: 5466 + int var49 = 0; // L: 5467 + var46 = var97.getString(var0.hitSplatValues[var79]); // L: 5468 + int var94 = var80.stringWidth(var46); // L: 5469 + if (var16 != null) { // L: 5470 + var47 = var16.getString(var0.hitSplatValues2[var79]); // L: 5471 + var49 = var45.stringWidth(var47); // L: 5472 + } + + int var50 = 0; // L: 5474 + int var51 = 0; // L: 5475 + if (var24 > 0) { // L: 5476 + if (var21 == null && var22 == null) { // L: 5477 + var50 = 1; // L: 5478 + } else { + var50 = var94 / var24 + 1; + } + } + + if (var16 != null && var36 > 0) { // L: 5480 5481 + if (var33 == null && var34 == null) { // L: 5482 + var51 = 1; // L: 5483 + } else { + var51 = var49 / var36 + 1; + } + } + + int var52 = 0; // L: 5486 + int var53 = var52; // L: 5487 + if (var23 > 0) { // L: 5488 + var52 += var23; + } + + var52 += 2; // L: 5489 + int var54 = var52; // L: 5490 + if (var25 > 0) { // L: 5491 + var52 += var25; + } + + int var55 = var52; // L: 5492 + int var56 = var52; // L: 5493 + int var57; + if (var24 > 0) { // L: 5494 + var57 = var50 * var24; // L: 5495 + var52 += var57; // L: 5496 + var56 += (var57 - var94) / 2; // L: 5497 + } else { + var52 += var94; // L: 5500 + } + + var57 = var52; // L: 5502 + if (var26 > 0) { // L: 5503 + var52 += var26; + } + + int var58 = 0; // L: 5504 + int var59 = 0; // L: 5505 + int var60 = 0; // L: 5506 + int var61 = 0; // L: 5507 + int var62 = 0; // L: 5508 + int var63; + if (var16 != null) { // L: 5509 + var52 += 2; // L: 5510 + var58 = var52; // L: 5511 + if (var35 > 0) { // L: 5512 + var52 += var35; + } + + var52 += 2; // L: 5513 + var59 = var52; // L: 5514 + if (var37 > 0) { // L: 5515 + var52 += var37; + } + + var60 = var52; // L: 5516 + var62 = var52; // L: 5517 + if (var36 > 0) { // L: 5518 + var63 = var36 * var51; // L: 5519 + var52 += var63; // L: 5520 + var62 += (var63 - var49) / 2; // L: 5521 + } else { + var52 += var49; // L: 5524 + } + + var61 = var52; // L: 5526 + if (var38 > 0) { // L: 5527 + var52 += var38; + } + } + + var63 = var0.hitSplatCycles[var79] - Client.cycle; // L: 5529 + int var64 = var97.field1812 - var63 * var97.field1812 / var97.field1805; // L: 5530 + int var65 = var63 * var97.field1807 / var97.field1805 + -var97.field1807; // L: 5531 + int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5532 + int var67 = var3 + Client.viewportTempY - 12 + var65; // L: 5533 + int var68 = var67; // L: 5534 + int var69 = var43 + var67; // L: 5535 + int var70 = var67 + var97.field1820 + 15; // L: 5536 + int var71 = var70 - var80.maxAscent; // L: 5537 + int var72 = var70 + var80.maxDescent; // L: 5538 + if (var71 < var67) { // L: 5539 + var68 = var71; + } + + if (var72 > var69) { // L: 5540 + var69 = var72; + } + + int var73 = 0; // L: 5541 + int var74; + int var75; + if (var16 != null) { // L: 5542 + var73 = var67 + var16.field1820 + 15; // L: 5543 + var74 = var73 - var45.maxAscent; // L: 5544 + var75 = var73 + var45.maxDescent; // L: 5545 + if (var74 < var68) { // L: 5546 + ; + } + + if (var75 > var69) { // L: 5547 + ; + } + } + + var74 = 255; // L: 5549 + if (var97.field1814 >= 0) { // L: 5550 + var74 = (var63 << 8) / (var97.field1805 - var97.field1814); + } + + if (var74 >= 0 && var74 < 255) { // L: 5551 + if (var19 != null) { // L: 5552 + var19.drawTransAt(var53 + var66 - var27, var67, var74); + } + + if (var21 != null) { // L: 5553 + var21.drawTransAt(var54 + var66 - var29, var67, var74); + } + + if (var20 != null) { // L: 5554 + for (var75 = 0; var75 < var50; ++var75) { // L: 5555 + var20.drawTransAt(var75 * var24 + (var55 + var66 - var28), var67, var74); // L: 5556 + } + } + + if (var22 != null) { // L: 5559 + var22.drawTransAt(var66 + var57 - var30, var67, var74); + } + + var80.drawAlpha(var46, var66 + var56, var70, var97.textColor, 0, var74); // L: 5560 + if (var16 != null) { // L: 5561 + if (var31 != null) { // L: 5562 + var31.drawTransAt(var66 + var58 - var39, var67, var74); + } + + if (var33 != null) { // L: 5563 + var33.drawTransAt(var66 + var59 - var41, var67, var74); + } + + if (var32 != null) { // L: 5564 + for (var75 = 0; var75 < var51; ++var75) { // L: 5565 + var32.drawTransAt(var75 * var36 + (var66 + var60 - var40), var67, var74); // L: 5566 + } + } + + if (var34 != null) { // L: 5569 + var34.drawTransAt(var61 + var66 - var42, var67, var74); + } + + var45.drawAlpha(var47, var66 + var62, var73, var16.textColor, 0, var74); // L: 5570 + } + } else { + if (var19 != null) { // L: 5574 + var19.drawTransBgAt(var53 + var66 - var27, var67); + } + + if (var21 != null) { // L: 5575 + var21.drawTransBgAt(var54 + var66 - var29, var67); + } + + if (var20 != null) { // L: 5576 + for (var75 = 0; var75 < var50; ++var75) { // L: 5577 + var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); // L: 5578 + } + } + + if (var22 != null) { // L: 5581 + var22.drawTransBgAt(var66 + var57 - var30, var67); + } + + var80.draw(var46, var56 + var66, var70, var97.textColor | -16777216, 0); // L: 5582 + if (var16 != null) { // L: 5583 + if (var31 != null) { // L: 5584 + var31.drawTransBgAt(var58 + var66 - var39, var67); + } + + if (var33 != null) { // L: 5585 + var33.drawTransBgAt(var59 + var66 - var41, var67); + } + + if (var32 != null) { // L: 5586 + for (var75 = 0; var75 < var51; ++var75) { // L: 5587 + var32.drawTransBgAt(var36 * var75 + (var66 + var60 - var40), var67); // L: 5588 + } + } + + if (var34 != null) { // L: 5591 + var34.drawTransBgAt(var66 + var61 - var42, var67); + } + + var45.draw(var47, var62 + var66, var73, var16.textColor | -16777216, 0); // L: 5592 + } + } + } + } + } + } + + } + } // L: 5597 } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 67fbd62802..e44440c84a 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,56 +1,71 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bu") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("te") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Lnr;" + descriptor = "Lnu;" ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("l") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 441486123 + intValue = -1877540813 ) @Export("param0") int param0; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1041645519 + intValue = -319901543 ) @Export("param1") int param1; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1414459793 + intValue = -2124872737 ) @Export("opcode") int opcode; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1513793095 + intValue = -1182228171 ) @Export("identifier") int identifier; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("action") String action; MenuAction() { - } + } // L: 12091 - @ObfuscatedName("a") + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-68078688" + descriptor = "(ZI)V", + garbageValue = "-780302169" ) - public static int method1885(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } + static final void method1912(boolean var0) { + class14.playPcmPlayers(); // L: 5878 + ++Client.packetWriter.pendingWrites; // L: 5879 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5880 + Client.packetWriter.pendingWrites = 0; // L: 5881 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5882 + PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2726, Client.packetWriter.isaacCipher); // L: 5884 + Client.packetWriter.addNode(var1); // L: 5885 + + try { + Client.packetWriter.flush(); // L: 5887 + } catch (IOException var3) { // L: 5889 + Client.hadNetworkError = true; // L: 5890 + } + } + + } + } // L: 5893 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 2c0369b5bd..8b55a3d204 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,168 +4,235 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bf") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("ti") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Lba;" + descriptor = "Lkd;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("x") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("l") + @Export("archive17") + static Archive archive17; + @ObfuscatedName("pg") + @ObfuscatedSignature( + descriptor = "Lch;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -128171313 + intValue = -1439385015 ) @Export("count") int count; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 724266419 + intValue = 1007637791 ) @Export("cycle") int cycle; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 721880757 + intValue = 1516763961 ) @Export("type") int type; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("sender") String sender; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpb;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("prefix") String prefix; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("text") String text; Message(int var1, String var2, String var3, String var4) { - this.isFromFriend0 = TriBool.TriBool_unknown; - this.isFromIgnored0 = TriBool.TriBool_unknown; - this.set(var1, var2, var3, 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1807824795" + garbageValue = "-2078367400" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = FloorUnderlayDefinition.method3082(); - this.cycle = Client.cycle; - this.type = var1; - this.sender = var2; - this.fillSenderUsername(); - this.prefix = var3; - this.text = var4; - this.clearIsFromFriend(); - this.clearIsFromIgnored(); - } + this.count = WorldMapDecorationType.method5193(); // L: 23 + this.cycle = Client.cycle; // L: 24 + this.type = var1; // L: 25 + this.sender = var2; // L: 26 + this.fillSenderUsername(); // L: 27 + this.prefix = var3; // L: 28 + this.text = var4; // L: 29 + this.clearIsFromFriend(); // L: 30 + this.clearIsFromIgnored(); // L: 31 + } // L: 32 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-34" + descriptor = "(I)V", + garbageValue = "-1556257738" ) @Export("clearIsFromFriend") void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; - } + this.isFromFriend0 = TriBool.TriBool_unknown; // L: 35 + } // L: 36 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-370100485" + descriptor = "(B)Z", + garbageValue = "-16" ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { - this.fillIsFromFriend(); + if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 39 + this.fillIsFromFriend(); // L: 40 } - return this.isFromFriend0 == TriBool.TriBool_true; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "48200845" - ) - @Export("fillIsFromFriend") - void fillIsFromFriend() { - this.isFromFriend0 = friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "367992410" - ) - @Export("clearIsFromIgnored") - void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "7812" - ) - @Export("isFromIgnored") - final boolean isFromIgnored() { - if (this.isFromIgnored0 == TriBool.TriBool_unknown) { - this.fillIsFromIgnored(); - } - - return this.isFromIgnored0 == TriBool.TriBool_true; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" - ) - @Export("fillIsFromIgnored") - void fillIsFromIgnored() { - this.isFromIgnored0 = friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + return this.isFromFriend0 == TriBool.TriBool_true; // L: 42 } @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "510739391" + garbageValue = "-788455751" + ) + @Export("fillIsFromFriend") + void fillIsFromFriend() { + this.isFromFriend0 = class112.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 46 + } // L: 47 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1428904972" + ) + @Export("clearIsFromIgnored") + void clearIsFromIgnored() { + this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 50 + } // L: 51 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "16" + ) + @Export("isFromIgnored") + final boolean isFromIgnored() { + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 54 + this.fillIsFromIgnored(); + } + + return this.isFromIgnored0 == TriBool.TriBool_true; // L: 57 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1115298616" + ) + @Export("fillIsFromIgnored") + void fillIsFromIgnored() { + this.isFromIgnored0 = class112.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 61 + } // L: 62 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1849939202" ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { - this.senderUsername = new Username(class351.method6286(this.sender), WorldMapSectionType.loginType); + if (this.sender != null) { // L: 65 + this.senderUsername = new Username(WallDecoration.method4643(this.sender), GrandExchangeOfferUnitPriceComparator.loginType); } else { - this.senderUsername = null; + this.senderUsername = null; // L: 66 } + } // L: 67 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)Z", + garbageValue = "45" + ) + static boolean method1143(String var0, int var1) { + return Occluder.method4485(var0, var1, "openjs"); // L: 55 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "51397423" + ) + static String method1149(char var0, int var1) { + char[] var2 = new char[var1]; // L: 195 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 196 + var2[var3] = var0; + } + + return new String(var2); // L: 197 + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1843523550" + ) + static boolean method1147() { + return (Client.drawPlayerNames & 2) != 0; // L: 5128 + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-404550822" + ) + static final void method1146() { + int var0 = SecureRandomCallable.menuX; // L: 8084 + int var1 = Frames.menuY; // L: 8085 + int var2 = ObjectComposition.menuWidth; // L: 8086 + int var3 = StudioGame.menuHeight; // L: 8087 + int var4 = 6116423; // L: 8088 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8089 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8090 + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8091 + Login.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8092 + int var5 = MouseHandler.MouseHandler_x; // L: 8093 + int var6 = MouseHandler.MouseHandler_y; // L: 8094 + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8095 + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 8096 + int var9 = 16777215; // L: 8097 + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8098 + var9 = 16776960; + } + + Login.fontBold12.draw(class392.method6873(var7), var0 + 3, var8, var9, 0); // L: 8099 + } + + Language.method5516(SecureRandomCallable.menuX, Frames.menuY, ObjectComposition.menuWidth, StudioGame.menuHeight); // L: 8101 + } // L: 8102 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 80569ea171..5c449175ce 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,76 +6,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cz") @Implements("Messages") public class Messages { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llm;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1654217227 + intValue = -1495629097 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("o") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("ba") - static String field1273; + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("eb") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive18") + static Archive archive18; static { - Messages_channels = new HashMap(); - Messages_hashTable = new IterableNodeHashTable(1024); - Messages_queue = new IterableDualNodeQueue(); - Messages_count = 0; + Messages_channels = new HashMap(); // L: 9 + Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 + Messages_queue = new IterableDualNodeQueue(); // L: 11 + Messages_count = 0; // L: 12 } - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1980575358" + descriptor = "(IIIIB)I", + garbageValue = "24" ) - public static boolean method2350(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field129[var0] : false; + static final int method2376(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 552 + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 553 } - @ObfuscatedName("im") + @ObfuscatedName("je") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1326528361" + descriptor = "(ZI)V", + garbageValue = "-56186501" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - WorldMapDecoration.scrollBarSprites[0].drawAt(var0, var1); - WorldMapDecoration.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field553); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10610 + } // L: 10611 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-63" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class174.loadInterface(var0)) { // L: 10622 + ClanChannel.updateInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10623 } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field514); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field697); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field697); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field697); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field697); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field555); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field555); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field555); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field555); - } + } // L: 10624 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 6ffe501c79..074608bece 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,260 +3,260 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("iz") @Implements("MidiFileReader") public class MidiFileReader { + @ObfuscatedName("b") + static final byte[] field2963; @ObfuscatedName("i") - static final byte[] field2958; - @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lop;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("division") int division; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("k") - int[] field2957; - @ObfuscatedName("t") - int field2962; + @ObfuscatedName("g") + int[] field2964; @ObfuscatedName("e") - long field2955; + int field2967; + @ObfuscatedName("j") + long field2965; static { - field2958 = 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}; + field2963 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 } MidiFileReader(byte[] var1) { this.buffer = new Buffer((byte[])null); - this.parse(var1); - } + this.parse(var1); // L: 26 + } // L: 27 MidiFileReader() { - this.buffer = new Buffer((byte[])null); - } + this.buffer = new Buffer((byte[])null); // L: 8 + } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("parse") void parse(byte[] var1) { - this.buffer.array = var1; - this.buffer.offset = 10; - int var2 = this.buffer.readUnsignedShort(); - this.division = this.buffer.readUnsignedShort(); - this.field2962 = 500000; - this.trackStarts = new int[var2]; + 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.field2967 = 500000; // L: 37 + this.trackStarts = new int[var2]; // L: 38 Buffer var10000; int var3; int var5; - 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; + 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 } - var10000 = this.buffer; + var10000 = this.buffer; // L: 46 } - this.field2955 = 0L; - this.trackPositions = new int[var2]; + this.field2965 = 0L; // L: 48 + this.trackPositions = new int[var2]; // L: 49 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 50 this.trackPositions[var3] = this.trackStarts[var3]; } - this.trackLengths = new int[var2]; - this.field2957 = new int[var2]; - } + this.trackLengths = new int[var2]; // L: 51 + this.field2964 = new int[var2]; // L: 52 + } // L: 53 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("clear") void clear() { - this.buffer.array = null; - this.trackStarts = null; - this.trackPositions = null; - this.trackLengths = null; - this.field2957 = null; - } + this.buffer.array = null; // L: 56 + this.trackStarts = null; // L: 57 + this.trackPositions = null; // L: 58 + this.trackLengths = null; // L: 59 + this.field2964 = null; // L: 60 + } // L: 61 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("isReady") boolean isReady() { - return this.buffer.array != null; - } - - @ObfuscatedName("j") - @Export("trackCount") - int trackCount() { - return this.trackPositions.length; - } - - @ObfuscatedName("m") - @Export("gotoTrack") - void gotoTrack(int var1) { - this.buffer.offset = this.trackPositions[var1]; - } - - @ObfuscatedName("k") - @Export("markTrackPosition") - void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.offset; - } - - @ObfuscatedName("t") - @Export("setTrackDone") - void setTrackDone() { - this.buffer.offset = -1; + return this.buffer.array != null; // L: 64 } @ObfuscatedName("a") - @Export("readTrackLength") - void readTrackLength(int var1) { - int var2 = this.buffer.readVarInt(); - int[] var10000 = this.trackLengths; - var10000[var1] += var2; + @Export("trackCount") + int trackCount() { + return this.trackPositions.length; // L: 68 } + @ObfuscatedName("o") + @Export("gotoTrack") + void gotoTrack(int var1) { + this.buffer.offset = this.trackPositions[var1]; // L: 72 + } // L: 73 + + @ObfuscatedName("g") + @Export("markTrackPosition") + void markTrackPosition(int var1) { + this.trackPositions[var1] = this.buffer.offset; // L: 76 + } // L: 77 + @ObfuscatedName("e") + @Export("setTrackDone") + void setTrackDone() { + this.buffer.offset = -1; // L: 80 + } // L: 81 + + @ObfuscatedName("p") + @Export("readTrackLength") + void readTrackLength(int var1) { + int var2 = this.buffer.readVarInt(); // L: 84 + int[] var10000 = this.trackLengths; + var10000[var1] += var2; // L: 85 + } // L: 86 + + @ObfuscatedName("j") @Export("readMessage") int readMessage(int var1) { - int var2 = this.readMessage0(var1); - return var2; + int var2 = this.readMessage0(var1); // L: 89 + return var2; // L: 90 } - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("readMessage0") int readMessage0(int var1) { - byte var2 = this.buffer.array[this.buffer.offset]; + byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; - if (var2 < 0) { - var5 = var2 & 255; - this.field2957[var1] = var5; - ++this.buffer.offset; + if (var2 < 0) { // L: 95 + var5 = var2 & 255; // L: 96 + this.field2964[var1] = var5; // L: 97 + ++this.buffer.offset; // L: 98 } else { - var5 = this.field2957[var1]; + var5 = this.field2964[var1]; // L: 101 } - if (var5 != 240 && var5 != 247) { - return this.method4862(var1, var5); + if (var5 != 240 && var5 != 247) { // L: 103 + return this.method4891(var1, var5); // L: 116 } else { - int var3 = this.buffer.readVarInt(); - if (var5 == 247 && var3 > 0) { - int var4 = this.buffer.array[this.buffer.offset] & 255; - if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { - ++this.buffer.offset; - this.field2957[var1] = var4; - return this.method4862(var1, var4); + 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.field2964[var1] = var4; // L: 109 + return this.method4891(var1, var4); // L: 110 } } - Buffer var10000 = this.buffer; + Buffer var10000 = this.buffer; // L: 113 var10000.offset += var3; - return 0; + return 0; // L: 114 + } + } + + @ObfuscatedName("x") + int method4891(int var1, int var2) { + int var4; + if (var2 == 255) { // L: 120 + int var7 = this.buffer.readUnsignedByte(); // L: 121 + var4 = this.buffer.readVarInt(); // L: 122 + Buffer var10000; + if (var7 == 47) { // L: 123 + var10000 = this.buffer; // L: 124 + 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.field2965 += (long)var6 * (long)(this.field2967 - var5); // L: 131 + this.field2967 = var5; // L: 132 + var10000 = this.buffer; // L: 133 + var10000.offset += var4; + return 2; // L: 134 + } else { + var10000 = this.buffer; // L: 136 + var10000.offset += var4; + return 3; // L: 137 + } + } else { + byte var3 = field2963[var2 - 128]; // L: 139 + var4 = var2; // L: 140 + if (var3 >= 1) { // L: 141 + var4 = var2 | this.buffer.readUnsignedByte() << 8; + } + + if (var3 >= 2) { // L: 142 + var4 |= this.buffer.readUnsignedByte() << 16; + } + + return var4; // L: 143 } } @ObfuscatedName("y") - int method4862(int var1, int var2) { - int var4; - if (var2 == 255) { - int var7 = this.buffer.readUnsignedByte(); - var4 = this.buffer.readVarInt(); - Buffer var10000; - if (var7 == 47) { - var10000 = this.buffer; - var10000.offset += var4; - return 1; - } else if (var7 == 81) { - int var5 = this.buffer.readMedium(); - var4 -= 3; - int var6 = this.trackLengths[var1]; - this.field2955 += (long)var6 * (long)(this.field2962 - var5); - this.field2962 = var5; - var10000 = this.buffer; - var10000.offset += var4; - return 2; - } else { - var10000 = this.buffer; - var10000.offset += var4; - return 3; - } - } else { - byte var3 = field2958[var2 - 128]; - var4 = var2; - if (var3 >= 1) { - var4 = var2 | this.buffer.readUnsignedByte() << 8; - } - - if (var3 >= 2) { - var4 |= this.buffer.readUnsignedByte() << 16; - } - - return var4; - } + long method4934(int var1) { + return this.field2965 + (long)var1 * (long)this.field2967; // L: 147 } - @ObfuscatedName("w") - long method4838(int var1) { - return this.field2955 + (long)var1 * (long)this.field2962; - } - - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("getPrioritizedTrack") int getPrioritizedTrack() { - int var1 = this.trackPositions.length; - int var2 = -1; - int var3 = Integer.MAX_VALUE; + int var1 = this.trackPositions.length; // L: 151 + int var2 = -1; // L: 152 + int var3 = Integer.MAX_VALUE; // L: 153 - for (int var4 = 0; var4 < var1; ++var4) { - if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { - var2 = var4; - var3 = this.trackLengths[var4]; + 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 } } - return var2; + return var2; // L: 161 } - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("isDone") boolean isDone() { - int var1 = this.trackPositions.length; + int var1 = this.trackPositions.length; // L: 165 - for (int var2 = 0; var2 < var1; ++var2) { + for (int var2 = 0; var2 < var1; ++var2) { // L: 166 if (this.trackPositions[var2] >= 0) { return false; } } - return true; + return true; // L: 167 } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("reset") void reset(long var1) { - this.field2955 = var1; - int var3 = this.trackPositions.length; + this.field2965 = var1; // L: 171 + int var3 = this.trackPositions.length; // L: 172 - for (int var4 = 0; var4 < var3; ++var4) { - this.trackLengths[var4] = 0; - this.field2957[var4] = 0; - this.buffer.offset = this.trackStarts[var4]; - this.readTrackLength(var4); - this.trackPositions[var4] = this.buffer.offset; + for (int var4 = 0; var4 < var3; ++var4) { // L: 173 + this.trackLengths[var4] = 0; // L: 174 + this.field2964[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 } - } + } // L: 180 } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index d16346163e..8387db9d8b 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -3,1230 +3,1116 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ig") +@ObfuscatedName("io") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2022470643 + intValue = -1803205059 ) - int field2922; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 458083617 - ) - int field2947; - @ObfuscatedName("j") - int[] field2934; - @ObfuscatedName("m") - int[] field2925; - @ObfuscatedName("k") - int[] field2930; - @ObfuscatedName("t") - int[] field2927; + int field2930; @ObfuscatedName("a") - int[] field2938; - @ObfuscatedName("e") - int[] field2929; - @ObfuscatedName("i") - int[] field2945; - @ObfuscatedName("y") - int[] field2931; - @ObfuscatedName("g") - int[] field2932; - @ObfuscatedName("z") - int[] field2948; - @ObfuscatedName("h") - int[] field2935; + @ObfuscatedGetter( + intValue = -567401845 + ) + int field2931; @ObfuscatedName("o") - int[] field2928; - @ObfuscatedName("r") + int[] field2956; + @ObfuscatedName("g") + int[] field2933; + @ObfuscatedName("e") + int[] field2934; + @ObfuscatedName("p") + int[] field2941; + @ObfuscatedName("j") + int[] field2936; + @ObfuscatedName("b") int[] field2937; - @ObfuscatedName("n") - int[] field2926; - @ObfuscatedName("u") + @ObfuscatedName("x") + int[] field2938; + @ObfuscatedName("y") int[] field2939; + @ObfuscatedName("k") + int[] field2940; @ObfuscatedName("d") + int[] field2944; + @ObfuscatedName("r") + int[] field2942; + @ObfuscatedName("m") + int[] field2943; + @ObfuscatedName("c") + int[] field2932; + @ObfuscatedName("f") + int[] field2945; + @ObfuscatedName("h") + int[] field2946; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[[Lib;" + descriptor = "[[Liu;" ) - MusicPatchNode[][] field2940; - @ObfuscatedName("ab") + MusicPatchNode[][] field2952; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[[Lib;" + descriptor = "[[Liu;" ) - MusicPatchNode[][] field2924; - @ObfuscatedName("ad") + MusicPatchNode[][] field2949; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liz;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("as") - boolean field2943; - @ObfuscatedName("ak") + @ObfuscatedName("aq") + boolean field2950; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1699428343 + intValue = -825600901 ) @Export("track") int track; - @ObfuscatedName("ah") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -2119963639 + intValue = -1277249171 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = 4917334441475948519L + longValue = -2626160015081860905L ) - long field2946; - @ObfuscatedName("al") + long field2953; + @ObfuscatedName("ah") @ObfuscatedGetter( - longValue = 8692867824420416607L + longValue = 8598063187503057895L ) - long field2936; - @ObfuscatedName("ao") + long field2954; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lih;" + descriptor = "Lij;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2922 = 256; - this.field2947 = 1000000; - this.field2934 = new int[16]; - this.field2925 = new int[16]; - this.field2930 = new int[16]; - this.field2927 = new int[16]; - this.field2938 = new int[16]; - this.field2929 = new int[16]; - this.field2945 = new int[16]; - this.field2931 = new int[16]; - this.field2932 = new int[16]; - this.field2948 = new int[16]; - this.field2935 = new int[16]; - this.field2928 = new int[16]; - this.field2937 = new int[16]; - this.field2926 = new int[16]; - this.field2939 = new int[16]; - this.field2940 = new MusicPatchNode[16][128]; - this.field2924 = new MusicPatchNode[16][128]; - this.midiFile = new MidiFileReader(); - this.patchStream = new MusicPatchPcmStream(this); - this.musicPatches = new NodeHashTable(128); - this.method4724(); - } + this.field2930 = 256; // L: 14 + this.field2931 = 1000000; // L: 15 + this.field2956 = new int[16]; // L: 16 + this.field2933 = new int[16]; // L: 17 + this.field2934 = new int[16]; // L: 18 + this.field2941 = new int[16]; // L: 19 + this.field2936 = new int[16]; // L: 20 + this.field2937 = new int[16]; // L: 21 + this.field2938 = new int[16]; // L: 22 + this.field2939 = new int[16]; // L: 23 + this.field2940 = new int[16]; // L: 24 + this.field2944 = new int[16]; // L: 28 + this.field2942 = new int[16]; // L: 29 + this.field2943 = new int[16]; // L: 30 + this.field2932 = new int[16]; // L: 31 + this.field2945 = new int[16]; // L: 32 + this.field2946 = new int[16]; // L: 33 + this.field2952 = new MusicPatchNode[16][128]; // L: 34 + this.field2949 = 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.method4773(); // L: 46 + } // L: 47 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1789077761" + garbageValue = "649793377" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2922 = var1; - } + this.field2930 = var1; // L: 50 + } // L: 51 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1238348421" + descriptor = "(B)I", + garbageValue = "26" ) - public int method4705() { - return this.field2922; + int method4754() { + return this.field2930; // L: 54 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lim;Lkl;Lat;IB)Z", - garbageValue = "49" + descriptor = "(Liv;Lko;Lad;IB)Z", + garbageValue = "84" ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4904(); - boolean var5 = true; - int[] var6 = null; - if (var4 > 0) { + var1.method4981(); // L: 58 + boolean var5 = true; // L: 59 + int[] var6 = null; // L: 60 + if (var4 > 0) { // L: 61 var6 = new int[]{var4}; } - 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) { - var9 = VarbitComposition.method3103(var2, var8); - if (var9 == null) { - var5 = false; + 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 + MusicPatch var10; + if (var11 == null) { // L: 69 + var10 = null; // L: 70 + } else { + var10 = new MusicPatch(var11); // L: 73 + } + + var9 = var10; // L: 75 + if (var10 == null) { // L: 76 + var5 = false; // L: 77 continue; } - this.musicPatches.put(var9, (long)var8); + this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method4875(var3, var7.byteArray, var6)) { + if (!var9.method4945(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } - if (var5) { + if (var5) { // L: 84 var1.clear(); } - return var5; + return var5; // L: 85 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "114" + garbageValue = "8" ) @Export("clearAll") public synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 var1.clear(); } - } + } // L: 90 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)V", garbageValue = "0" ) @Export("removeAll") - public synchronized void removeAll() { + synchronized void removeAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.remove(); + var1.remove(); // L: 93 } - } + } // L: 94 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { - return this.patchStream; + return this.patchStream; // L: 469 } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { - return null; - } - - @ObfuscatedName("a") - protected synchronized int vmethod4889() { - return 0; - } - - @ObfuscatedName("e") - @Export("fill") - protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2947 / PcmPlayer.field279; - - do { - long var5 = (long)var3 * (long)var4 + this.field2946; - if (this.field2936 - var5 >= 0L) { - this.field2946 = var5; - break; - } - - int var7 = (int)(((long)var4 + (this.field2936 - this.field2946) - 1L) / (long)var4); - this.field2946 += (long)var4 * (long)var7; - this.patchStream.fill(var1, var2, var7); - var2 += var7; - var3 -= var7; - this.method4737(); - } while(this.midiFile.isReady()); - } - - this.patchStream.fill(var1, var2, var3); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lim;ZI)V", - garbageValue = "664654337" - ) - @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); - this.midiFile.parse(var1.midi); - this.field2943 = var2; - this.field2946 = 0L; - int var3 = this.midiFile.trackCount(); - - for (int var4 = 0; var4 < var3; ++var4) { - this.midiFile.gotoTrack(var4); - this.midiFile.readTrackLength(var4); - this.midiFile.markTrackPosition(var4); - } - - this.track = this.midiFile.getPrioritizedTrack(); - this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2936 = this.midiFile.method4838(this.trackLength); - } - - @ObfuscatedName("y") - @Export("skip") - protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2947 / PcmPlayer.field279; - - do { - long var3 = this.field2946 + (long)var2 * (long)var1; - if (this.field2936 - var3 >= 0L) { - this.field2946 = var3; - break; - } - - int var5 = (int)((this.field2936 - this.field2946 + (long)var2 - 1L) / (long)var2); - this.field2946 += (long)var2 * (long)var5; - this.patchStream.skip(var5); - var1 -= var5; - this.method4737(); - } while(this.midiFile.isReady()); - } - - this.patchStream.skip(var1); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" - ) - @Export("clear") - public synchronized void clear() { - this.midiFile.clear(); - this.method4724(); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "5" - ) - @Export("isReady") - public synchronized boolean isReady() { - return this.midiFile.isReady(); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "200806688" - ) - public synchronized void method4736(int var1, int var2) { - this.method4791(var1, var2); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1047068773" - ) - void method4791(int var1, int var2) { - this.field2927[var1] = var2; - this.field2929[var1] = var2 & -128; - this.method4721(var1, var2); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "104" - ) - void method4721(int var1, int var2) { - if (var2 != this.field2938[var1]) { - this.field2938[var1] = var2; - - for (int var3 = 0; var3 < 128; ++var3) { - this.field2924[var1][var3] = null; - } - } - - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "92" - ) - void method4750(int var1, int var2, int var3) { - this.method4717(var1, var2, 64); - if ((this.field2948[var1] & 2) != 0) { - for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2980 == var1 && var4.field2978 < 0) { - this.field2940[var1][var4.field2988] = null; - this.field2940[var1][var2] = var4; - int var8 = (var4.field2983 * var4.field2987 >> 12) + var4.field2986; - var4.field2986 += var2 - var4.field2988 << 8; - var4.field2987 = var8 - var4.field2986; - var4.field2983 = 4096; - var4.field2988 = var2; - return; - } - } - } - - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2938[var1]); - if (var9 != null) { - RawSound var5 = var9.rawSounds[var2]; - if (var5 != null) { - MusicPatchNode var6 = new MusicPatchNode(); - var6.field2980 = var1; - var6.patch = var9; - var6.rawSound = var5; - var6.field2981 = var9.field2968[var2]; - var6.field2985 = var9.field2964[var2]; - var6.field2988 = var2; - var6.field2984 = var3 * var3 * var9.field2966[var2] * var9.field2969 + 1024 >> 11; - var6.field2982 = var9.field2970[var2] & 255; - var6.field2986 = (var2 << 8) - (var9.field2965[var2] & 32767); - var6.field2989 = 0; - var6.field2990 = 0; - var6.field2991 = 0; - var6.field2978 = -1; - var6.field2993 = 0; - if (this.field2937[var1] == 0) { - var6.stream = RawPcmStream.method794(var5, this.method4729(var6), this.method4782(var6), this.method4731(var6)); - } else { - var6.stream = RawPcmStream.method794(var5, this.method4729(var6), 0, this.method4731(var6)); - this.method4802(var6, var9.field2965[var2] < 0); - } - - if (var9.field2965[var2] < 0) { - var6.stream.setNumLoops(-1); - } - - if (var6.field2985 >= 0) { - MusicPatchNode var7 = this.field2924[var1][var6.field2985]; - if (var7 != null && var7.field2978 < 0) { - this.field2940[var1][var7.field2988] = null; - var7.field2978 = 0; - } - - this.field2924[var1][var6.field2985] = var6; - } - - this.patchStream.queue.addFirst(var6); - this.field2940[var1][var2] = var6; - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lib;ZI)V", - garbageValue = "2049564626" - ) - void method4802(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; - int var4; - if (var2 && var1.rawSound.field249) { - int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2937[var1.field2980] >> 6); - var3 <<= 8; - if (var4 >= var3) { - var4 = var3 + var3 - 1 - var4; - var1.stream.method803(); - } - } else { - var4 = (int)((long)this.field2937[var1.field2980] * (long)var3 >> 6); - } - - var1.stream.method839(var4); + return null; // L: 473 } @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2145702834" - ) - void method4717(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2940[var1][var2]; - if (var4 != null) { - this.field2940[var1][var2] = null; - if ((this.field2948[var1] & 2) != 0) { - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var4.field2980 == var5.field2980 && var5.field2978 < 0 && var4 != var5) { - var4.field2978 = 0; - break; - } + protected synchronized int vmethod4958() { + return 0; // L: 477 + } + + @ObfuscatedName("j") + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 481 + int var4 = this.midiFile.division * this.field2931 / UserComparator2.field4359; // L: 482 + + do { + long var5 = this.field2953 + (long)var4 * (long)var3; // L: 484 + if (this.field2954 - var5 >= 0L) { // L: 485 + this.field2953 = var5; // L: 486 + break; } - } else { - var4.field2978 = 0; - } + int var7 = (int)((this.field2954 - this.field2953 + (long)var4 - 1L) / (long)var4); // L: 489 + this.field2953 += (long)var7 * (long)var4; // L: 490 + this.patchStream.fill(var1, var2, var7); // L: 491 + var2 += var7; // L: 492 + var3 -= var7; // L: 493 + this.method4758(); // L: 494 + } while(this.midiFile.isReady()); // L: 495 } - } - @ObfuscatedName("z") + this.patchStream.fill(var1, var2, var3); // L: 498 + } // L: 499 + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "3615" + descriptor = "(Liv;ZI)V", + garbageValue = "-323229472" ) - void method4748(int var1, int var2, int var3) { + @Export("setMusicTrack") + public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 97 + this.midiFile.parse(var1.midi); // L: 98 + this.field2950 = var2; // L: 99 + this.field2953 = 0L; // L: 100 + int var3 = this.midiFile.trackCount(); // L: 101 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 102 + this.midiFile.gotoTrack(var4); // L: 103 + this.midiFile.readTrackLength(var4); // L: 104 + this.midiFile.markTrackPosition(var4); // L: 105 + } + + this.track = this.midiFile.getPrioritizedTrack(); // L: 107 + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 + this.field2954 = this.midiFile.method4934(this.trackLength); // L: 109 + } // L: 110 + + @ObfuscatedName("x") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 502 + int var2 = this.midiFile.division * this.field2931 / UserComparator2.field4359; // L: 503 + + do { + long var3 = (long)var1 * (long)var2 + this.field2953; // L: 505 + if (this.field2954 - var3 >= 0L) { // L: 506 + this.field2953 = var3; // L: 507 + break; + } + + int var5 = (int)(((long)var2 + (this.field2954 - this.field2953) - 1L) / (long)var2); // L: 510 + this.field2953 += (long)var5 * (long)var2; // L: 511 + this.patchStream.skip(var5); // L: 512 + var1 -= var5; // L: 513 + this.method4758(); // L: 514 + } while(this.midiFile.isReady()); // L: 515 + } + + this.patchStream.skip(var1); // L: 518 + } // L: 519 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "8" + ) + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 113 + this.method4773(); // L: 114 + } // L: 115 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-131350281" + ) + @Export("isReady") + public synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 118 } - @ObfuscatedName("h") + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-2025298930" + ) + public synchronized void method4761(int var1, int var2) { + this.method4826(var1, var2); // L: 122 + } // L: 123 + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "-29" + garbageValue = "-59" ) - void method4719(int var1, int var2) { - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "23625" - ) - void method4720(int var1, int var2) { - this.field2945[var1] = var2; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "849653299" - ) - void method4723(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2980 == var1) { - if (var2.stream != null) { - var2.stream.method807(PcmPlayer.field279 / 100); - if (var2.stream.method920()) { - this.patchStream.mixer.addSubStream(var2.stream); - } - - var2.method4913(); - } - - if (var2.field2978 < 0) { - this.field2940[var2.field2980][var2.field2988] = null; - } - - var2.remove(); - } - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-33" - ) - void method4722(int var1) { - if (var1 >= 0) { - this.field2934[var1] = 12800; - this.field2925[var1] = 8192; - this.field2930[var1] = 16383; - this.field2945[var1] = 8192; - this.field2931[var1] = 0; - this.field2932[var1] = 8192; - this.method4725(var1); - this.method4726(var1); - this.field2948[var1] = 0; - this.field2935[var1] = 32767; - this.field2928[var1] = 256; - this.field2937[var1] = 0; - this.method4709(var1, 8192); - } else { - for (var1 = 0; var1 < 16; ++var1) { - this.method4722(var1); - } - - } - } + void method4826(int var1, int var2) { + this.field2941[var1] = var2; // L: 126 + this.field2937[var1] = var2 & -128; // L: 127 + this.method4863(var1, var2); // L: 128 + } // L: 129 @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "298420171" + descriptor = "(IIB)V", + garbageValue = "-70" ) - void method4787(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2980 == var1) && var2.field2978 < 0) { - this.field2940[var2.field2980][var2.field2988] = null; - var2.field2978 = 0; + void method4863(int var1, int var2) { + if (var2 != this.field2936[var1]) { // L: 132 + this.field2936[var1] = var2; // L: 133 + + for (int var3 = 0; var3 < 128; ++var3) { // L: 134 + this.field2949[var1][var3] = null; } } - } + } // L: 136 - @ObfuscatedName("ah") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" + descriptor = "(IIIB)V", + garbageValue = "0" ) - void method4724() { - this.method4723(-1); - this.method4722(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2938[var1] = this.field2927[var1]; + void method4764(int var1, int var2, int var3) { + this.method4847(var1, var2, 64); // L: 139 + if ((this.field2944[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.field2996 == var1 && var4.field2999 < 0) { // L: 142 + this.field2952[var1][var4.field2990] = null; // L: 143 + this.field2952[var1][var2] = var4; // L: 144 + int var8 = (var4.field2998 * var4.field2997 >> 12) + var4.field2993; // L: 145 + var4.field2993 += var2 - var4.field2990 << 8; // L: 146 + var4.field2997 = var8 - var4.field2993; // L: 147 + var4.field2998 = 4096; // L: 148 + var4.field2990 = var2; // L: 149 + return; // L: 150 + } + } } - for (var1 = 0; var1 < 16; ++var1) { - this.field2929[var1] = this.field2927[var1] & -128; + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2936[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.field2996 = var1; // L: 159 + var6.patch = var9; // L: 160 + var6.rawSound = var5; // L: 161 + var6.field2988 = var9.field2976[var2]; // L: 162 + var6.field2989 = var9.field2977[var2]; // L: 163 + var6.field2990 = var2; // L: 164 + var6.field2991 = var3 * var3 * var9.field2974[var2] * var9.field2973 + 1024 >> 11; // L: 165 + var6.field2992 = var9.field2971[var2] & 255; // L: 166 + var6.field2993 = (var2 << 8) - (var9.field2972[var2] & 32767); // L: 167 + var6.field2986 = 0; // L: 168 + var6.field3004 = 0; // L: 169 + var6.field2994 = 0; // L: 170 + var6.field2999 = -1; // L: 171 + var6.field3000 = 0; // L: 172 + if (this.field2932[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method817(var5, this.method4778(var6), this.method4779(var6), this.method4780(var6)); // L: 174 + } else { + var6.stream = RawPcmStream.method817(var5, this.method4778(var6), 0, this.method4780(var6)); // L: 177 + this.method4765(var6, var9.field2972[var2] < 0); // L: 178 + } + + if (var9.field2972[var2] < 0) { // L: 180 + var6.stream.setNumLoops(-1); + } + + if (var6.field2989 >= 0) { // L: 181 + MusicPatchNode var7 = this.field2949[var1][var6.field2989]; // L: 182 + if (var7 != null && var7.field2999 < 0) { // L: 183 + this.field2952[var1][var7.field2990] = null; // L: 184 + var7.field2999 = 0; // L: 185 + } + + this.field2949[var1][var6.field2989] = var6; // L: 187 + } + + this.patchStream.queue.addFirst(var6); // L: 189 + this.field2952[var1][var2] = var6; // L: 190 + } + } + } // L: 191 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Liu;ZI)V", + garbageValue = "1139290365" + ) + void method4765(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 194 + int var4; + if (var2 && var1.rawSound.field238) { // L: 196 + int var5 = var3 + var3 - var1.rawSound.start; // L: 197 + var4 = (int)((long)this.field2932[var1.field2996] * (long)var5 >> 6); // L: 198 + var3 <<= 8; // L: 199 + if (var4 >= var3) { // L: 200 + var4 = var3 + var3 - 1 - var4; // L: 201 + var1.stream.method922(); // L: 202 + } + } else { + var4 = (int)((long)var3 * (long)this.field2932[var1.field2996] >> 6); // L: 206 } - } + var1.stream.method825(var4); // L: 208 + } // L: 209 - @ObfuscatedName("ay") + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1890191910" + ) + void method4847(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2952[var1][var2]; // L: 212 + if (var4 != null) { // L: 213 + this.field2952[var1][var2] = null; // L: 214 + if ((this.field2944[var1] & 2) != 0) { // L: 215 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 + if (var4.field2996 == var5.field2996 && var5.field2999 < 0 && var4 != var5) { // L: 217 + var4.field2999 = 0; // L: 218 + break; // L: 219 + } + } + } else { + var4.field2999 = 0; // L: 224 + } + + } + } // L: 226 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-1181683312" + ) + void method4853(int var1, int var2, int var3) { + } // L: 228 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "825528878" + ) + void method4768(int var1, int var2) { + } // L: 229 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "21" + ) + void method4769(int var1, int var2) { + this.field2938[var1] = var2; // L: 232 + } // L: 233 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1217191884" + ) + void method4770(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 + if (var1 < 0 || var2.field2996 == var1) { // L: 237 + if (var2.stream != null) { // L: 238 + var2.stream.method830(UserComparator2.field4359 / 100); // L: 239 + if (var2.stream.method834()) { // L: 240 + this.patchStream.mixer.addSubStream(var2.stream); + } + + var2.method4992(); // L: 241 + } + + if (var2.field2999 < 0) { // L: 243 + this.field2952[var2.field2996][var2.field2990] = null; + } + + var2.remove(); // L: 244 + } + } + + } // L: 247 + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-75" + garbageValue = "87" ) - void method4725(int var1) { - if ((this.field2948[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2980 == var1 && this.field2940[var1][var2.field2988] == null && var2.field2978 < 0) { - var2.field2978 = 0; + void method4771(int var1) { + if (var1 >= 0) { // L: 250 + this.field2956[var1] = 12800; // L: 254 + this.field2933[var1] = 8192; // L: 255 + this.field2934[var1] = 16383; // L: 256 + this.field2938[var1] = 8192; // L: 257 + this.field2939[var1] = 0; // L: 258 + this.field2940[var1] = 8192; // L: 259 + this.method4774(var1); // L: 260 + this.method4775(var1); // L: 261 + this.field2944[var1] = 0; // L: 262 + this.field2942[var1] = 32767; // L: 263 + this.field2943[var1] = 256; // L: 264 + this.field2932[var1] = 0; // L: 265 + this.method4777(var1, 8192); // L: 266 + } else { + for (var1 = 0; var1 < 16; ++var1) { // L: 251 + this.method4771(var1); + } + + } + } // L: 252 267 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "94" + ) + void method4772(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 + if ((var1 < 0 || var2.field2996 == var1) && var2.field2999 < 0) { // L: 271 272 + this.field2952[var2.field2996][var2.field2990] = null; // L: 273 + var2.field2999 = 0; // L: 274 + } + } + + } // L: 278 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "53312168" + ) + void method4773() { + this.method4770(-1); // L: 281 + this.method4771(-1); // L: 282 + + int var1; + for (var1 = 0; var1 < 16; ++var1) { // L: 283 + this.field2936[var1] = this.field2941[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { // L: 284 + this.field2937[var1] = this.field2941[var1] & -128; + } + + } // L: 285 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "453228054" + ) + void method4774(int var1) { + if ((this.field2944[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.field2996 == var1 && this.field2952[var1][var2.field2990] == null && var2.field2999 < 0) { // L: 290 291 + var2.field2999 = 0; } } } - } + } // L: 295 - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "791445586" + garbageValue = "-2001136983" ) - void method4726(int var1) { - if ((this.field2948[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2980 == var1) { - var2.field2998 = 0; + void method4775(int var1) { + if ((this.field2944[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.field2996 == var1) { // L: 300 + var2.field3003 = 0; } } } - } + } // L: 303 - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1057431192" + descriptor = "(IB)V", + garbageValue = "1" ) - void method4727(int var1) { - int var2 = var1 & 240; + void method4776(int var1) { + int var2 = var1 & 240; // L: 306 int var3; int var4; int var5; - if (var2 == 128) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method4717(var3, var4, var5); - } else if (var2 == 144) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var5 > 0) { - this.method4750(var3, var4, var5); + if (var2 == 128) { // L: 307 + var3 = var1 & 15; // L: 308 + var4 = var1 >> 8 & 127; // L: 309 + var5 = var1 >> 16 & 127; // L: 310 + this.method4847(var3, var4, var5); // L: 311 + } else if (var2 == 144) { // L: 314 + var3 = var1 & 15; // L: 315 + var4 = var1 >> 8 & 127; // L: 316 + var5 = var1 >> 16 & 127; // L: 317 + if (var5 > 0) { // L: 318 + this.method4764(var3, var4, var5); } else { - this.method4717(var3, var4, 64); + this.method4847(var3, var4, 64); // L: 319 } - } else if (var2 == 160) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method4748(var3, var4, var5); - } else if (var2 == 176) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var4 == 0) { - this.field2929[var3] = (var5 << 14) + (this.field2929[var3] & -2080769); + } else if (var2 == 160) { // L: 322 + var3 = var1 & 15; // L: 323 + var4 = var1 >> 8 & 127; // L: 324 + var5 = var1 >> 16 & 127; // L: 325 + this.method4853(var3, var4, var5); // L: 326 + } else if (var2 == 176) { // L: 329 + var3 = var1 & 15; // L: 330 + var4 = var1 >> 8 & 127; // L: 331 + var5 = var1 >> 16 & 127; // L: 332 + if (var4 == 0) { // L: 333 + this.field2937[var3] = (var5 << 14) + (this.field2937[var3] & -2080769); } - if (var4 == 32) { - this.field2929[var3] = (var5 << 7) + (this.field2929[var3] & -16257); + if (var4 == 32) { // L: 334 + this.field2937[var3] = (var5 << 7) + (this.field2937[var3] & -16257); } - if (var4 == 1) { - this.field2931[var3] = (var5 << 7) + (this.field2931[var3] & -16257); + if (var4 == 1) { // L: 335 + this.field2939[var3] = (var5 << 7) + (this.field2939[var3] & -16257); } - if (var4 == 33) { - this.field2931[var3] = var5 + (this.field2931[var3] & -128); + if (var4 == 33) { // L: 336 + this.field2939[var3] = var5 + (this.field2939[var3] & -128); } - if (var4 == 5) { - this.field2932[var3] = (var5 << 7) + (this.field2932[var3] & -16257); + if (var4 == 5) { // L: 337 + this.field2940[var3] = (var5 << 7) + (this.field2940[var3] & -16257); } - if (var4 == 37) { - this.field2932[var3] = var5 + (this.field2932[var3] & -128); + if (var4 == 37) { // L: 338 + this.field2940[var3] = var5 + (this.field2940[var3] & -128); } - if (var4 == 7) { + if (var4 == 7) { // L: 339 + this.field2956[var3] = (var5 << 7) + (this.field2956[var3] & -16257); + } + + if (var4 == 39) { // L: 340 + this.field2956[var3] = var5 + (this.field2956[var3] & -128); + } + + if (var4 == 10) { // L: 341 + this.field2933[var3] = (var5 << 7) + (this.field2933[var3] & -16257); + } + + if (var4 == 42) { // L: 342 + this.field2933[var3] = var5 + (this.field2933[var3] & -128); + } + + if (var4 == 11) { // L: 343 this.field2934[var3] = (var5 << 7) + (this.field2934[var3] & -16257); } - if (var4 == 39) { + if (var4 == 43) { // L: 344 this.field2934[var3] = var5 + (this.field2934[var3] & -128); } - if (var4 == 10) { - this.field2925[var3] = (var5 << 7) + (this.field2925[var3] & -16257); - } - - if (var4 == 42) { - this.field2925[var3] = var5 + (this.field2925[var3] & -128); - } - - if (var4 == 11) { - this.field2930[var3] = (var5 << 7) + (this.field2930[var3] & -16257); - } - - if (var4 == 43) { - this.field2930[var3] = var5 + (this.field2930[var3] & -128); - } - int[] var10000; - if (var4 == 64) { - if (var5 >= 64) { - var10000 = this.field2948; + if (var4 == 64) { // L: 345 + if (var5 >= 64) { // L: 346 + var10000 = this.field2944; var10000[var3] |= 1; } else { - var10000 = this.field2948; + var10000 = this.field2944; // L: 347 var10000[var3] &= -2; } } - if (var4 == 65) { - if (var5 >= 64) { - var10000 = this.field2948; + if (var4 == 65) { // L: 349 + if (var5 >= 64) { // L: 350 + var10000 = this.field2944; var10000[var3] |= 2; } else { - this.method4725(var3); - var10000 = this.field2948; + this.method4774(var3); // L: 352 + var10000 = this.field2944; // L: 353 var10000[var3] &= -3; } } - if (var4 == 99) { - this.field2935[var3] = (var5 << 7) + (this.field2935[var3] & 127); + if (var4 == 99) { // L: 356 + this.field2942[var3] = (var5 << 7) + (this.field2942[var3] & 127); } - if (var4 == 98) { - this.field2935[var3] = (this.field2935[var3] & 16256) + var5; + if (var4 == 98) { // L: 357 + this.field2942[var3] = (this.field2942[var3] & 16256) + var5; } - if (var4 == 101) { - this.field2935[var3] = (var5 << 7) + (this.field2935[var3] & 127) + 16384; + if (var4 == 101) { // L: 358 + this.field2942[var3] = (var5 << 7) + (this.field2942[var3] & 127) + 16384; } - if (var4 == 100) { - this.field2935[var3] = (this.field2935[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 359 + this.field2942[var3] = (this.field2942[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { - this.method4723(var3); + if (var4 == 120) { // L: 360 + this.method4770(var3); } - if (var4 == 121) { - this.method4722(var3); + if (var4 == 121) { // L: 361 + this.method4771(var3); } - if (var4 == 123) { - this.method4787(var3); + if (var4 == 123) { // L: 362 + this.method4772(var3); } int var6; - if (var4 == 6) { - var6 = this.field2935[var3]; - if (var6 == 16384) { - this.field2928[var3] = (var5 << 7) + (this.field2928[var3] & -16257); + if (var4 == 6) { // L: 363 + var6 = this.field2942[var3]; // L: 364 + if (var6 == 16384) { // L: 365 + this.field2943[var3] = (var5 << 7) + (this.field2943[var3] & -16257); } } - if (var4 == 38) { - var6 = this.field2935[var3]; - if (var6 == 16384) { - this.field2928[var3] = var5 + (this.field2928[var3] & -128); + if (var4 == 38) { // L: 367 + var6 = this.field2942[var3]; // L: 368 + if (var6 == 16384) { // L: 369 + this.field2943[var3] = var5 + (this.field2943[var3] & -128); } } - if (var4 == 16) { - this.field2937[var3] = (var5 << 7) + (this.field2937[var3] & -16257); + if (var4 == 16) { // L: 371 + this.field2932[var3] = (var5 << 7) + (this.field2932[var3] & -16257); } - if (var4 == 48) { - this.field2937[var3] = var5 + (this.field2937[var3] & -128); + if (var4 == 48) { // L: 372 + this.field2932[var3] = var5 + (this.field2932[var3] & -128); } - if (var4 == 81) { - if (var5 >= 64) { - var10000 = this.field2948; + if (var4 == 81) { // L: 373 + if (var5 >= 64) { // L: 374 + var10000 = this.field2944; var10000[var3] |= 4; } else { - this.method4726(var3); - var10000 = this.field2948; + this.method4775(var3); // L: 376 + var10000 = this.field2944; // L: 377 var10000[var3] &= -5; } } if (var4 == 17) { - this.method4709(var3, (var5 << 7) + (this.field2926[var3] & -16257)); + this.method4777(var3, (var5 << 7) + (this.field2945[var3] & -16257)); // L: 380 } - if (var4 == 49) { - this.method4709(var3, var5 + (this.field2926[var3] & -128)); + if (var4 == 49) { // L: 381 + this.method4777(var3, var5 + (this.field2945[var3] & -128)); } - } else if (var2 == 192) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method4721(var3, var4 + this.field2929[var3]); - } else if (var2 == 208) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method4719(var3, var4); - } else if (var2 == 224) { - var3 = var1 & 15; - var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method4720(var3, var4); + } else if (var2 == 192) { // L: 384 + var3 = var1 & 15; // L: 385 + var4 = var1 >> 8 & 127; // L: 386 + this.method4863(var3, var4 + this.field2937[var3]); // L: 387 + } else if (var2 == 208) { // L: 390 + var3 = var1 & 15; // L: 391 + var4 = var1 >> 8 & 127; // L: 392 + this.method4768(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.method4769(var3, var4); // L: 399 } else { - var2 = var1 & 255; - if (var2 == 255) { - this.method4724(); + var2 = var1 & 255; // L: 402 + if (var2 == 255) { // L: 403 + this.method4773(); // L: 404 } } - } + } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-2135389317" + garbageValue = "-1520019758" ) - void method4709(int var1, int var2) { - this.field2926[var1] = var2; - this.field2939[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); - } + void method4777(int var1, int var2) { + this.field2945[var1] = var2; // L: 410 + this.field2946[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 + } // L: 412 - @ObfuscatedName("ac") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lib;I)I", - garbageValue = "-1323579923" + descriptor = "(Liu;B)I", + garbageValue = "0" ) - int method4729(MusicPatchNode var1) { - int var2 = (var1.field2983 * var1.field2987 >> 12) + var1.field2986; - var2 += (this.field2945[var1.field2980] - 8192) * this.field2928[var1.field2980] >> 12; - MusicPatchNode2 var3 = var1.field2981; + int method4778(MusicPatchNode var1) { + int var2 = (var1.field2998 * var1.field2997 >> 12) + var1.field2993; // L: 415 + var2 += (this.field2938[var1.field2996] - 8192) * this.field2943[var1.field2996] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field2988; // L: 417 int var4; - if (var3.field2907 > 0 && (var3.field2906 > 0 || this.field2931[var1.field2980] > 0)) { - var4 = var3.field2906 << 2; - int var5 = var3.field2908 << 1; - if (var1.field2994 < var5) { - var4 = var4 * var1.field2994 / var5; + if (var3.field2911 > 0 && (var3.field2917 > 0 || this.field2939[var1.field2996] > 0)) { // L: 418 + var4 = var3.field2917 << 2; // L: 419 + int var5 = var3.field2919 << 1; // L: 420 + if (var1.field3001 < var5) { // L: 421 + var4 = var4 * var1.field3001 / var5; } - var4 += this.field2931[var1.field2980] >> 7; - double var6 = Math.sin((double)(var1.field2995 & 511) * 0.01227184630308513D); - var2 += (int)(var6 * (double)var4); + var4 += this.field2939[var1.field2996] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3002 & 511)); // L: 423 + var2 += (int)(var6 * (double)var4); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field279 + 0.5D); - return var4 < 1 ? 1 : var4; + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)UserComparator2.field4359 + 0.5D); // L: 426 + return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("at") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lib;B)I", - garbageValue = "-1" + descriptor = "(Liu;B)I", + garbageValue = "4" ) - int method4782(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2981; - int var3 = this.field2930[var1.field2980] * this.field2934[var1.field2980] + 4096 >> 13; - var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2984 + 16384 >> 15; - var3 = var3 * this.field2922 + 128 >> 8; - if (var2.field2902 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2902 * (double)var1.field2989 * 1.953125E-5D) + 0.5D); + int method4779(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2988; // L: 431 + int var3 = this.field2934[var1.field2996] * this.field2956[var1.field2996] + 4096 >> 13; // L: 432 + var3 = var3 * var3 + 16384 >> 15; // L: 433 + var3 = var3 * var1.field2991 + 16384 >> 15; // L: 434 + var3 = var3 * this.field2930 + 128 >> 8; // L: 435 + if (var2.field2913 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2913 * (double)var1.field2986 * 1.953125E-5D) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field2903 != null) { - var4 = var1.field2990; - var5 = var2.field2903[var1.field2991 + 1]; - if (var1.field2991 < var2.field2903.length - 2) { - var6 = (var2.field2903[var1.field2991] & 255) << 8; - var7 = (var2.field2903[var1.field2991 + 2] & 255) << 8; - var5 += (var2.field2903[var1.field2991 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2916 != null) { // L: 439 + var4 = var1.field3004; // L: 440 + var5 = var2.field2916[var1.field2994 + 1]; // L: 441 + if (var1.field2994 < var2.field2916.length - 2) { // L: 442 + var6 = (var2.field2916[var1.field2994] & 255) << 8; // L: 443 + var7 = (var2.field2916[var1.field2994 + 2] & 255) << 8; // L: 444 + var5 += (var4 - var6) * (var2.field2916[var1.field2994 + 3] - var5) / (var7 - var6); // L: 445 } - var3 = var3 * var5 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; // L: 447 } - if (var1.field2978 > 0 && var2.field2901 != null) { - var4 = var1.field2978; - var5 = var2.field2901[var1.field2993 + 1]; - if (var1.field2993 < var2.field2901.length - 2) { - var6 = (var2.field2901[var1.field2993] & 255) << 8; - var7 = (var2.field2901[var1.field2993 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2901[var1.field2993 + 3] - var5) / (var7 - var6); + if (var1.field2999 > 0 && var2.field2914 != null) { // L: 449 + var4 = var1.field2999; // L: 450 + var5 = var2.field2914[var1.field3000 + 1]; // L: 451 + if (var1.field3000 < var2.field2914.length - 2) { // L: 452 + var6 = (var2.field2914[var1.field3000] & 255) << 8; // L: 453 + var7 = (var2.field2914[var1.field3000 + 2] & 255) << 8; // L: 454 + var5 += (var2.field2914[var1.field3000 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 } - var3 = var3 * var5 + 32 >> 6; + var3 = var5 * var3 + 32 >> 6; // L: 457 } - return var3; + return var3; // L: 459 } - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lib;I)I", - garbageValue = "1020464759" + descriptor = "(Liu;I)I", + garbageValue = "702321980" ) - int method4731(MusicPatchNode var1) { - int var2 = this.field2925[var1.field2980]; - return var2 < 8192 ? var2 * var1.field2982 + 32 >> 6 : 16384 - ((128 - var1.field2982) * (16384 - var2) + 32 >> 6); + int method4780(MusicPatchNode var1) { + int var2 = this.field2933[var1.field2996]; // L: 463 + return var2 < 8192 ? var2 * var1.field2992 + 32 >> 6 : 16384 - ((128 - var1.field2992) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("an") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1646259213" + descriptor = "(B)V", + garbageValue = "-86" ) - void method4737() { - int var1 = this.track; - int var2 = this.trackLength; + void method4758() { + int var1 = this.track; // L: 522 + int var2 = this.trackLength; // L: 523 long var3; - for (var3 = this.field2936; var2 == this.trackLength; var3 = this.midiFile.method4838(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.field2943 || var2 == 0) { - this.method4724(); - this.midiFile.clear(); - return; + for (var3 = this.field2954; var2 == this.trackLength; var3 = this.midiFile.method4934(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.field2950 || var2 == 0) { // L: 533 + this.method4773(); // L: 537 + this.midiFile.clear(); // L: 538 + return; // L: 539 } - this.midiFile.reset(var3); + this.midiFile.reset(var3); // L: 534 } break; } - if ((var5 & 128) != 0) { - this.method4727(var5); + if ((var5 & 128) != 0) { // L: 541 + this.method4776(var5); } - this.midiFile.readTrackLength(var1); - this.midiFile.markTrackPosition(var1); + this.midiFile.readTrackLength(var1); // L: 542 + this.midiFile.markTrackPosition(var1); // L: 543 } - var1 = this.midiFile.getPrioritizedTrack(); - var2 = this.midiFile.trackLengths[var1]; + var1 = this.midiFile.getPrioritizedTrack(); // L: 545 + var2 = this.midiFile.trackLengths[var1]; // L: 546 } - this.track = var1; - this.trackLength = var2; - this.field2936 = var3; - } + this.track = var1; // L: 549 + this.trackLength = var2; // L: 550 + this.field2954 = var3; // L: 551 + } // L: 552 - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lib;B)Z", - garbageValue = "-114" + descriptor = "(Liu;I)Z", + garbageValue = "-1636960835" ) - boolean method4797(MusicPatchNode var1) { - if (var1.stream == null) { - if (var1.field2978 >= 0) { - var1.remove(); - if (var1.field2985 > 0 && var1 == this.field2924[var1.field2980][var1.field2985]) { - this.field2924[var1.field2980][var1.field2985] = null; + boolean method4787(MusicPatchNode var1) { + if (var1.stream == null) { // L: 555 + if (var1.field2999 >= 0) { // L: 556 + var1.remove(); // L: 557 + if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 558 + this.field2949[var1.field2996][var1.field2989] = null; // L: 559 } } - return true; + return true; // L: 562 } else { - return false; + return false; // L: 564 } } - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lib;[IIII)Z", - garbageValue = "1929584471" + descriptor = "(Liu;[IIII)Z", + garbageValue = "-47865740" ) - boolean method4739(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2997 = PcmPlayer.field279 / 100; - if (var1.field2978 < 0 || var1.stream != null && !var1.stream.method810()) { - int var5 = var1.field2983; - if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2932[var1.field2980] * 4.921259842519685E-4D) + 0.5D); - if (var5 < 0) { + boolean method4788(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2995 = UserComparator2.field4359 / 100; // L: 568 + if (var1.field2999 < 0 || var1.stream != null && !var1.stream.method833()) { // L: 569 + int var5 = var1.field2998; // L: 577 + if (var5 > 0) { // L: 578 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2940[var1.field2996]) + 0.5D); // L: 579 + if (var5 < 0) { // L: 580 var5 = 0; } - var1.field2983 = var5; + var1.field2998 = var5; // L: 581 } - var1.stream.method808(this.method4729(var1)); - MusicPatchNode2 var6 = var1.field2981; - boolean var7 = false; - ++var1.field2994; - var1.field2995 += var6.field2907; - double var8 = (double)((var1.field2988 - 60 << 8) + (var1.field2987 * var1.field2983 >> 12)) * 5.086263020833333E-6D; - if (var6.field2902 > 0) { - if (var6.field2905 > 0) { - var1.field2989 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2905 * var8) + 0.5D); + var1.stream.method912(this.method4778(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field2988; // L: 584 + boolean var7 = false; // L: 585 + ++var1.field3001; // L: 586 + var1.field3002 += var6.field2911; // L: 587 + double var8 = 5.086263020833333E-6D * (double)((var1.field2990 - 60 << 8) + (var1.field2997 * var1.field2998 >> 12)); // L: 588 + if (var6.field2913 > 0) { // L: 589 + if (var6.field2912 > 0) { // L: 590 + var1.field2986 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2912 * var8) + 0.5D); } else { - var1.field2989 += 128; + var1.field2986 += 128; // L: 591 } } - if (var6.field2903 != null) { - if (var6.field2900 > 0) { - var1.field2990 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2900 * var8) + 0.5D); + if (var6.field2916 != null) { // L: 593 + if (var6.field2918 > 0) { // L: 594 + var1.field3004 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2918) + 0.5D); } else { - var1.field2990 += 128; + var1.field3004 += 128; // L: 595 } - while (var1.field2991 < var6.field2903.length - 2 && var1.field2990 > (var6.field2903[var1.field2991 + 2] & 255) << 8) { - var1.field2991 += 2; + while (var1.field2994 < var6.field2916.length - 2 && var1.field3004 > (var6.field2916[var1.field2994 + 2] & 255) << 8) { // L: 596 + var1.field2994 += 2; } - if (var6.field2903.length - 2 == var1.field2991 && var6.field2903[var1.field2991 + 1] == 0) { + if (var6.field2916.length - 2 == var1.field2994 && var6.field2916[var1.field2994 + 1] == 0) { // L: 597 var7 = true; } } - if (var1.field2978 >= 0 && var6.field2901 != null && (this.field2948[var1.field2980] & 1) == 0 && (var1.field2985 < 0 || var1 != this.field2924[var1.field2980][var1.field2985])) { - if (var6.field2904 > 0) { - var1.field2978 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2904) + 0.5D); + if (var1.field2999 >= 0 && var6.field2914 != null && (this.field2944[var1.field2996] & 1) == 0 && (var1.field2989 < 0 || var1 != this.field2949[var1.field2996][var1.field2989])) { // L: 599 600 + if (var6.field2915 > 0) { // L: 601 + var1.field2999 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2915) + 0.5D); } else { - var1.field2978 += 128; + var1.field2999 += 128; // L: 602 } - while (var1.field2993 < var6.field2901.length - 2 && var1.field2978 > (var6.field2901[var1.field2993 + 2] & 255) << 8) { - var1.field2993 += 2; + while (var1.field3000 < var6.field2914.length - 2 && var1.field2999 > (var6.field2914[var1.field3000 + 2] & 255) << 8) { // L: 603 + var1.field3000 += 2; } - if (var6.field2901.length - 2 == var1.field2993) { + if (var6.field2914.length - 2 == var1.field3000) { // L: 604 var7 = true; } } - if (var7) { - var1.stream.method807(var1.field2997); - if (var2 != null) { + if (var7) { // L: 607 + var1.stream.method830(var1.field2995); // L: 608 + if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); + var1.stream.skip(var4); // L: 610 } - if (var1.stream.method920()) { + if (var1.stream.method834()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4913(); - if (var1.field2978 >= 0) { - var1.remove(); - if (var1.field2985 > 0 && var1 == this.field2924[var1.field2980][var1.field2985]) { - this.field2924[var1.field2980][var1.field2985] = null; + var1.method4992(); // L: 612 + if (var1.field2999 >= 0) { // L: 613 + var1.remove(); // L: 614 + if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 615 + this.field2949[var1.field2996][var1.field2989] = null; // L: 616 } } - return true; + return true; // L: 619 } else { - var1.stream.method806(var1.field2997, this.method4782(var1), this.method4731(var1)); - return false; + var1.stream.method829(var1.field2995, this.method4779(var1), this.method4780(var1)); // L: 621 + return false; // L: 622 } } else { - var1.method4913(); - var1.remove(); - if (var1.field2985 > 0 && var1 == this.field2924[var1.field2980][var1.field2985]) { - this.field2924[var1.field2980][var1.field2985] = null; + var1.method4992(); // L: 570 + var1.remove(); // L: 571 + if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 572 + this.field2949[var1.field2996][var1.field2989] = null; // L: 573 } - return true; + return true; // L: 575 } } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-990431040" + descriptor = "(Lbw;B)V", + garbageValue = "97" ) - static int method4814(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1586 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1587 + FriendSystem.method1755(var0.isMembersOnly()); // L: 1588 } - } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-733050611" - ) - public static int method4815(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1988064953" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; + if (var0.properties != Client.worldProperties) { // L: 1590 + Archive var1 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 1591 + int var2 = var0.properties; // L: 1592 + if ((var2 & 536870912) != 0) { // L: 1594 + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1595 + } else if ((var2 & 1073741824) != 0) { // L: 1597 + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1598 + } else { + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1601 } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; - return var8 * (128 - var7) + var9 * var7 >> 7; - } else { - return 0; } - } - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(ZLoy;S)V", - garbageValue = "16035" - ) - static final void method4806(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - int var2 = var1.readBits(15); - if (var2 != 32767) { - boolean var3 = false; - if (Client.npcs[var2] == null) { - Client.npcs[var2] = new NPC(); - var3 = true; - } - - NPC var4 = Client.npcs[var2]; - Client.npcIndices[++Client.npcCount - 1] = var2; - var4.npcCycle = Client.cycle; - int var7; - if (var0) { - var7 = var1.readBits(8); - if (var7 > 127) { - var7 -= 256; - } - } else { - var7 = var1.readBits(5); - if (var7 > 15) { - var7 -= 32; - } - } - - int var8 = var1.readBits(1); - if (var8 == 1) { - Client.field535[++Client.field713 - 1] = var2; - } - - int var6; - if (var0) { - var6 = var1.readBits(8); - if (var6 > 127) { - var6 -= 256; - } - } else { - var6 = var1.readBits(5); - if (var6 > 15) { - var6 -= 32; - } - } - - int var9 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var9; - } - - var4.definition = class112.getNpcDefinition(var1.readBits(14)); - boolean var10 = var1.readBits(1) == 1; - if (var10) { - var1.readBits(32); - } - - int var5 = var1.readBits(1); - var4.field1109 = var4.definition.size; - var4.field1146 = var4.definition.rotation; - if (var4.field1146 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.idleSequence = var4.definition.idleSequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method2234(class67.localPlayer.pathX[0] + var6, class67.localPlayer.pathY[0] + var7, var5 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } - } + WorldMapIcon_0.worldHost = var0.host; // L: 1605 + Client.worldId = var0.id; // L: 1606 + Client.worldProperties = var0.properties; // L: 1607 + ApproximateRouteStrategy.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1608 + ParamComposition.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1609 + ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 1610 + } // L: 1611 } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 9bb6a4230a..7fe16ce26e 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,225 +1,238 @@ +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("eo") @Implements("MilliClock") public class MilliClock extends Clock { + @ObfuscatedName("i") + long[] field1581; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1278293949 + ) + int field1585; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1723820895 + ) + int field1583; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1652344105 + longValue = -2827552193639050909L ) - static int field1588; - @ObfuscatedName("l") - long[] field1592; - @ObfuscatedName("q") + long field1584; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 13513773 + intValue = 1430749655 ) - int field1587; - @ObfuscatedName("f") + int field1582; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -546197089 + intValue = 1845625337 ) - int field1589; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = 1648403741631593641L - ) - long field1586; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -2027949555 - ) - int field1590; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1944600771 - ) - int field1591; + int field1586; - MilliClock() { - this.field1592 = new long[10]; - this.field1587 = 256; - this.field1589 = 1; - this.field1590 = 0; - this.field1586 = UserComparator4.method2406(); + public MilliClock() { + this.field1581 = new long[10]; // L: 7 + this.field1585 = 256; // L: 15 + this.field1583 = 1; // L: 16 + this.field1582 = 0; // L: 17 + this.field1584 = class111.method2516(); // L: 18 - for (int var1 = 0; var1 < 10; ++var1) { - this.field1592[var1] = this.field1586; + for (int var1 = 0; var1 < 10; ++var1) { // L: 19 + this.field1581[var1] = this.field1584; // L: 20 } - } + } // L: 22 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-973245062" + garbageValue = "1421350581" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { - this.field1592[var1] = 0L; + for (int var1 = 0; var1 < 10; ++var1) { // L: 25 + this.field1581[var1] = 0L; // L: 26 } - } + } // L: 28 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "904483746" + garbageValue = "1121035205" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1587; - int var4 = this.field1589; - this.field1587 = 300; - this.field1589 = 1; - this.field1586 = UserComparator4.method2406(); - if (this.field1592[this.field1591] == 0L) { - this.field1587 = var3; - this.field1589 = var4; - } else if (this.field1586 > this.field1592[this.field1591]) { - this.field1587 = (int)((long)(var1 * 2560) / (this.field1586 - this.field1592[this.field1591])); + int var3 = this.field1585; // L: 31 + int var4 = this.field1583; // L: 32 + this.field1585 = 300; + this.field1583 = 1; + this.field1584 = class111.method2516(); // L: 35 + if (this.field1581[this.field1586] == 0L) { + this.field1585 = var3; // L: 37 + this.field1583 = var4; // L: 38 + } else if (this.field1584 > this.field1581[this.field1586]) { + this.field1585 = (int)((long)(var1 * 2560) / (this.field1584 - this.field1581[this.field1586])); } - if (this.field1587 < 25) { - this.field1587 = 25; + if (this.field1585 < 25) { + this.field1585 = 25; } - if (this.field1587 > 256) { - this.field1587 = 256; - this.field1589 = (int)((long)var1 - (this.field1586 - this.field1592[this.field1591]) / 10L); + if (this.field1585 > 256) { + this.field1585 = 256; // L: 43 + this.field1583 = (int)((long)var1 - (this.field1584 - this.field1581[this.field1586]) / 10L); } - if (this.field1589 > var1) { - this.field1589 = var1; + if (this.field1583 > var1) { + this.field1583 = var1; } - this.field1592[this.field1591] = this.field1586; - this.field1591 = (this.field1591 + 1) % 10; + this.field1581[this.field1586] = this.field1584; + this.field1586 = (this.field1586 + 1) % 10; int var5; - if (this.field1589 > 1) { + if (this.field1583 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field1592[var5]) { - this.field1592[var5] += (long)this.field1589; + if (0L != this.field1581[var5]) { + this.field1581[var5] += (long)this.field1583; } } } - if (this.field1589 < var2) { - this.field1589 = var2; + if (this.field1583 < var2) { + this.field1583 = var2; } - class121.method2542((long)this.field1589); + FloorUnderlayDefinition.method3190((long)this.field1583); - for (var5 = 0; this.field1590 < 256; this.field1590 += this.field1587) { + for (var5 = 0; this.field1582 < 256; this.field1582 += this.field1585) { ++var5; } - this.field1590 &= 255; + this.field1582 &= 255; return var5; } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "1031571888" - ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; - } - - return var1; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "152507441" - ) - public static void method2858() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); - } - @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Lht;", - garbageValue = "-1575464478" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "1919228175" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { if (var1 != null) { - return var1; + var1.printStackTrace(); } else { - var1 = class124.method2560(class13.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + Throwable var4 = var1; // L: 36 + String var5; + if (var1 instanceof RunException) { // L: 39 + RunException var6 = (RunException)var1; // L: 40 + var5 = var6.message + " | "; // L: 41 + var4 = var6.throwable; // L: 42 + } else { + var5 = ""; // L: 44 + } + + StringWriter var18 = new StringWriter(); // L: 45 + PrintWriter var7 = new PrintWriter(var18); // L: 46 + var4.printStackTrace(var7); // L: 47 + var7.close(); // L: 48 + String var8 = var18.toString(); // L: 49 + BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50 + String var10 = var9.readLine(); // L: 51 + + label62: + while (true) { + while (true) { + String var11 = var9.readLine(); // L: 53 + if (var11 == null) { // L: 54 + var5 = var5 + "| " + var10; // L: 72 + var2 = var5; // L: 75 + break label62; + } + + int var12 = var11.indexOf(40); // L: 55 + int var13 = var11.indexOf(41, var12 + 1); // L: 56 + if (var12 >= 0 && var13 >= 0) { // L: 57 + String var14 = var11.substring(var12 + 1, var13); // L: 58 + int var15 = var14.indexOf(".java:"); // L: 59 + if (var15 >= 0) { // L: 60 + var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61 + var5 = var5 + var14 + ' '; // L: 62 + continue; // L: 63 + } + + var11 = var11.substring(0, var12); // L: 65 + } + + var11 = var11.trim(); // L: 67 + var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68 + var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69 + var5 = var5 + var11 + ' '; // L: 70 + } + } + } + + if (var0 != null) { // L: 77 + if (var1 != null) { // L: 78 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 79 + } + + System.out.println("Error: " + var2); // L: 81 + var2 = var2.replace(':', '.'); // L: 82 + var2 = var2.replace('@', '_'); // L: 83 + var2 = var2.replace('&', '_'); // L: 84 + var2 = var2.replace('#', '_'); // L: 85 + if (RunException.RunException_applet == null) { // L: 86 + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + GrandExchangeOfferAgeComparator.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 87 + DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88 + var17.read(); // L: 89 + var17.close(); // L: 90 + } catch (Exception var16) { // L: 92 } - return var1; } + } // L: 93 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lop;B)Ljava/lang/String;", + garbageValue = "-102" + ) + public static String method2955(Buffer var0) { + return AbstractWorldMapData.method3956(var0, 32767); // L: 64 } + + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "-32506034" + ) + static void method2954(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 11980 + Client.randomDatData = new byte[24]; + } + + class321.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11981 + } // L: 11982 } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index c0b400a92a..120da48377 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,3 +1,4 @@ +import java.awt.Component; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; @@ -6,152 +7,182 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("ks") @Implements("ModeWhere") public enum ModeWhere implements MouseWheel { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3819("", 0, new class301[]{class301.field3781}), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3817("", 1, new class301[]{class301.field3782, class301.field3781}), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3805("", 2, new class301[]{class301.field3782, class301.field3780, class301.field3781}), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3806("", 3, new class301[]{class301.field3782}), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3807("", 4), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3808("", 5, new class301[]{class301.field3782, class301.field3781}), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3809("", 6, new class301[]{class301.field3781}), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3811("", 8, new class301[]{class301.field3782, class301.field3781}), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3815("", 9, new class301[]{class301.field3782, class301.field3780}), @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3812("", 10, new class301[]{class301.field3782}), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lkw;" - ) - field3813("", 11, new class301[]{class301.field3782}), + field3803("", 0, new class301[]{class301.field3769}), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3803("", 12, new class301[]{class301.field3782, class301.field3781}), + field3791("", 1, new class301[]{class301.field3770, class301.field3769}), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3792("", 2, new class301[]{class301.field3770, class301.field3767, class301.field3769}), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3793("", 3, new class301[]{class301.field3770}), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3794("", 4), @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3814("", 13, new class301[]{class301.field3782}); - + field3796("", 5, new class301[]{class301.field3770, class301.field3769}), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3807("", 6, new class301[]{class301.field3769}), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3790("", 8, new class301[]{class301.field3770, class301.field3769}), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3798("", 9, new class301[]{class301.field3770, class301.field3767}), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3799("", 10, new class301[]{class301.field3770}), @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lks;" ) - static ClanSettings field3804; - @ObfuscatedName("fz") - @ObfuscatedGetter( - intValue = 1626624097 + field3800("", 11, new class301[]{class301.field3770}), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lks;" ) - static int field3818; - @ObfuscatedName("hp") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("v") + field3801("", 12, new class301[]{class301.field3770, class301.field3769}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + field3802("", 13, new class301[]{class301.field3770}); + + @ObfuscatedName("hs") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1200736709 + intValue = -1276405955 ) @Export("id") final int id; - @ObfuscatedName("s") - final Set field3810; + @ObfuscatedName("l") + final Set field3804; + + static { + method5536(); // L: 28 + } // L: 29 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lkh;)V" + descriptor = "(Ljava/lang/String;I[Lkq;)V" ) ModeWhere(String var3, int var4, class301[] var5) { - this.field3810 = new HashSet(); - this.id = var4; - class301[] var6 = var5; + this.field3804 = new HashSet(); + this.id = var4; // L: 43 + class301[] var6 = var5; // L: 45 - for (int var7 = 0; var7 < var6.length; ++var7) { - class301 var8 = var6[var7]; - this.field3810.add(var8); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 + class301 var8 = var6[var7]; // L: 47 + this.field3804.add(var8); // L: 48 } - } + } // L: 51 ModeWhere(String var3, int var4) { - this.field3810 = new HashSet(); + this.field3804 = new HashSet(); // L: 32 this.id = var4; } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "84" + ) + static void method5543(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 39 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 40 + } // L: 41 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)[Lks;", + garbageValue = "-88" + ) + static ModeWhere[] method5536() { + return new ModeWhere[]{field3802, field3803, field3801, field3790, field3792, field3796, field3791, field3807, field3793, field3799, field3794, field3798, field3800}; // L: 35 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "95" + ) + public static void method5542() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 52 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 53 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 54 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 55 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 56 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 57 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 58 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 59 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 60 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 61 + } + } // L: 63 + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "217948810" + descriptor = "(II)V", + garbageValue = "1212689938" ) - static final void method5487() { - if (Client.field722 != VertexNormal.Client_plane) { - Client.field722 = VertexNormal.Client_plane; - WorldMapSectionType.method3830(VertexNormal.Client_plane); + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field710) { // L: 4078 + WorldMapCacheName.method4027(); // L: 4079 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class408.clientPreferences.musicVolume != 0 && !Client.field710) { // L: 4081 + Archive var1 = Messages.archive6; // L: 4082 + int var2 = class408.clientPreferences.musicVolume; // L: 4083 + class247.musicPlayerStatus = 1; // L: 4085 + class128.musicTrackArchive = var1; // L: 4086 + FillMode.musicTrackGroupId = var0; // L: 4087 + ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 4088 + class247.musicTrackVolume = var2; // L: 4089 + SecureRandomCallable.musicTrackBoolean = false; // L: 4090 + class247.pcmSampleLength = 2; // L: 4091 } - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1805506953" - ) - static boolean method5483(int var0) { - for (int var1 = 0; var1 < Client.field726; ++var1) { - if (Client.field718[var1] == var0) { - return true; - } - } - - return false; - } + Client.currentTrackGroupId = var0; // L: 4094 + } // L: 4095 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 173546e226..b24c385b94 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -6,410 +6,410 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hl") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lhl;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lhl;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ac") - static boolean[] field2543; - @ObfuscatedName("at") - static boolean[] field2544; - @ObfuscatedName("ax") + @ObfuscatedName("ar") + static boolean[] field2554; + @ObfuscatedName("ad") + static boolean[] field2548; + @ObfuscatedName("an") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("an") + @ObfuscatedName("ax") @Export("modelViewportYs") static int[] modelViewportYs; @ObfuscatedName("av") - static int[] field2547; + static int[] field2551; @ObfuscatedName("ap") - static int[] field2548; + static int[] field2574; + @ObfuscatedName("au") + static int[] field2547; @ObfuscatedName("aj") - static int[] field2549; - @ObfuscatedName("am") - static int[] field2514; - @ObfuscatedName("az") - static int[] field2539; - @ObfuscatedName("ae") - static int[][] field2553; - @ObfuscatedName("ai") - static int[] field2554; - @ObfuscatedName("af") - static int[][] field2555; - @ObfuscatedName("bz") + static int[] field2575; + @ObfuscatedName("aw") static int[] field2556; - @ObfuscatedName("bt") - static int[] field2557; - @ObfuscatedName("bg") + @ObfuscatedName("ao") + static int[][] field2557; + @ObfuscatedName("aa") static int[] field2558; - @ObfuscatedName("bf") - static int[] field2559; - @ObfuscatedName("bj") - static int[] field2507; - @ObfuscatedName("bo") + @ObfuscatedName("ay") + static int[][] field2559; + @ObfuscatedName("bg") + static int[] field2560; + @ObfuscatedName("bl") static int[] field2561; @ObfuscatedName("bx") + static int[] field2528; + @ObfuscatedName("bd") + static int[] field2563; + @ObfuscatedName("bt") + static int[] field2564; + @ObfuscatedName("bf") + static int[] field2521; + @ObfuscatedName("bs") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("ba") - static boolean field2538; - @ObfuscatedName("bs") + @ObfuscatedName("bm") + static boolean field2576; + @ObfuscatedName("bo") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bb") - static int[] field2515; - @ObfuscatedName("bh") + @ObfuscatedName("bu") + static int[] field2540; + @ObfuscatedName("bz") static int[] field2508; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("verticesCount") int verticesCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("verticesX") int[] verticesX; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("verticesY") int[] verticesY; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("indicesCount") int indicesCount; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("indices1") int[] indices1; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("indices2") int[] indices2; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("indices3") int[] indices3; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("x") - byte[] field2504; - @ObfuscatedName("p") + @ObfuscatedName("z") + byte[] field2566; + @ObfuscatedName("q") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("z") - byte field2523; - @ObfuscatedName("h") - int field2570; - @ObfuscatedName("o") - int[] field2525; + @ObfuscatedName("d") + byte field2527; @ObfuscatedName("r") - int[] field2526; - @ObfuscatedName("n") - int[] field2527; - @ObfuscatedName("u") + int field2522; + @ObfuscatedName("m") + int[] field2529; + @ObfuscatedName("c") + int[] field2530; + @ObfuscatedName("f") + int[] field2538; + @ObfuscatedName("h") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("boundsType") int boundsType; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("bottomY") int bottomY; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("diameter") int diameter; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("radius") int radius; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("xMid") int xMid; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("yMid") int yMid; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("zMid") int zMid; - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("zMidOffset") int zMidOffset; static { - Model_sharedSequenceModel = new Model(); - Model_sharedSequenceModelFaceAlphas = new byte[1]; - Model_sharedSpotAnimationModel = new Model(); - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2543 = new boolean[6500]; - field2544 = new boolean[6500]; - modelViewportXs = new int[6500]; - modelViewportYs = new int[6500]; - field2547 = new int[6500]; - field2548 = new int[6500]; - field2549 = new int[6500]; - field2514 = new int[6500]; - field2539 = new int[1600]; - field2553 = new int[1600][512]; - field2554 = new int[12]; - field2555 = new int[12][2000]; - field2556 = new int[2000]; - field2557 = new int[2000]; - field2558 = new int[12]; - field2559 = new int[10]; - field2507 = new int[10]; - field2561 = new int[10]; - field2538 = true; - Model_sine = Rasterizer3D.Rasterizer3D_sine; - Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field2515 = Rasterizer3D.Rasterizer3D_colorPalette; - field2508 = Rasterizer3D.field2369; + Model_sharedSequenceModel = new Model(); // L: 6 + Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 + Model_sharedSpotAnimationModel = new Model(); // L: 8 + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 + field2554 = new boolean[6500]; // L: 45 + field2548 = new boolean[6500]; // L: 46 + modelViewportXs = new int[6500]; // L: 47 + modelViewportYs = new int[6500]; // L: 48 + field2551 = new int[6500]; // L: 49 + field2574 = new int[6500]; // L: 50 + field2547 = new int[6500]; // L: 51 + field2575 = new int[6500]; // L: 52 + field2556 = new int[1600]; // L: 54 + field2557 = new int[1600][512]; // L: 55 + field2558 = new int[12]; // L: 56 + field2559 = new int[12][2000]; // L: 57 + field2560 = new int[2000]; // L: 58 + field2561 = new int[2000]; // L: 59 + field2528 = new int[12]; // L: 60 + field2563 = new int[10]; // L: 61 + field2564 = new int[10]; // L: 62 + field2521 = new int[10]; // L: 63 + field2576 = true; // L: 67 + Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 + Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 + field2540 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field2508 = Rasterizer3D.field2347; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2523 = 0; - this.field2570 = 0; + this.field2527 = 0; + this.field2522 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; this.zMidOffset = -1; - } + } // L: 77 @ObfuscatedSignature( descriptor = "([Lhl;I)V" ) public Model(Model[] var1, int var2) { - this.verticesCount = 0; - this.indicesCount = 0; - this.field2523 = 0; - this.field2570 = 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.field2570 = 0; - this.field2523 = -1; + this.verticesCount = 0; // L: 10 + this.indicesCount = 0; // L: 14 + this.field2527 = 0; // L: 25 + this.field2522 = 0; // L: 26 + this.isSingleTile = false; // L: 32 + this.xMidOffset = -1; // L: 41 + this.yMidOffset = -1; // L: 42 + this.zMidOffset = -1; // L: 43 + boolean var3 = false; // L: 80 + boolean var4 = false; // L: 81 + boolean var5 = false; // L: 82 + boolean var6 = false; // L: 83 + this.verticesCount = 0; // L: 84 + this.indicesCount = 0; // L: 85 + this.field2522 = 0; // L: 86 + this.field2527 = -1; // L: 87 int var7; Model var8; - for (var7 = 0; var7 < var2; ++var7) { - var8 = var1[var7]; - if (var8 != null) { - this.verticesCount += var8.verticesCount; - this.indicesCount += var8.indicesCount; - this.field2570 += var8.field2570; - if (var8.faceRenderPriorities != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 88 + var8 = var1[var7]; // L: 89 + if (var8 != null) { // L: 90 + this.verticesCount += var8.verticesCount; // L: 91 + this.indicesCount += var8.indicesCount; // L: 92 + this.field2522 += var8.field2522; // L: 93 + if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field2523 == -1) { - this.field2523 = var8.field2523; + if (this.field2527 == -1) { // L: 96 + this.field2527 = var8.field2527; } - if (this.field2523 != var8.field2523) { + if (this.field2527 != var8.field2527) { // L: 97 var3 = true; } } - var4 |= var8.faceAlphas != null; - var5 |= var8.faceTextures != null; - var6 |= var8.field2504 != null; + var4 |= var8.faceAlphas != null; // L: 99 + var5 |= var8.faceTextures != null; // L: 100 + var6 |= var8.field2566 != null; // L: 101 } } - 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.verticesX = new int[this.verticesCount]; // L: 104 + this.verticesY = new int[this.verticesCount]; // L: 105 + this.verticesZ = new int[this.verticesCount]; // L: 106 + this.indices1 = new int[this.indicesCount]; // L: 107 + this.indices2 = new int[this.indicesCount]; // L: 108 + this.indices3 = new int[this.indicesCount]; // L: 109 + this.faceColors1 = new int[this.indicesCount]; // L: 110 + this.faceColors2 = new int[this.indicesCount]; // L: 111 + this.faceColors3 = new int[this.indicesCount]; // L: 112 + if (var3) { // L: 113 this.faceRenderPriorities = new byte[this.indicesCount]; } - if (var4) { + if (var4) { // L: 114 this.faceAlphas = new byte[this.indicesCount]; } - if (var5) { + if (var5) { // L: 115 this.faceTextures = new short[this.indicesCount]; } - if (var6) { - this.field2504 = new byte[this.indicesCount]; + if (var6) { // L: 116 + this.field2566 = new byte[this.indicesCount]; } - if (this.field2570 > 0) { - this.field2525 = new int[this.field2570]; - this.field2526 = new int[this.field2570]; - this.field2527 = new int[this.field2570]; + if (this.field2522 > 0) { // L: 117 + this.field2529 = new int[this.field2522]; // L: 118 + this.field2530 = new int[this.field2522]; // L: 119 + this.field2538 = new int[this.field2522]; // L: 120 } - this.verticesCount = 0; - this.indicesCount = 0; - this.field2570 = 0; + this.verticesCount = 0; // L: 122 + this.indicesCount = 0; // L: 123 + this.field2522 = 0; // L: 124 - for (var7 = 0; var7 < var2; ++var7) { - var8 = var1[var7]; - if (var8 != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 125 + var8 = var1[var7]; // L: 126 + if (var8 != null) { // L: 127 int var9; - 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) { + for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 128 + this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 129 + this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 130 + this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 131 + this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 132 + this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 133 + this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 134 + if (var3) { // L: 135 + if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2523; + this.faceRenderPriorities[this.indicesCount] = var8.field2527; // L: 137 } } - if (var4 && var8.faceAlphas != null) { + if (var4 && var8.faceAlphas != null) { // L: 139 140 this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if (var5) { - if (var8.faceTextures != null) { + if (var5) { // L: 142 + if (var8.faceTextures != null) { // L: 143 this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { - this.faceTextures[this.indicesCount] = -1; + this.faceTextures[this.indicesCount] = -1; // L: 144 } } - if (var6) { - if (var8.field2504 != null && var8.field2504[var9] != -1) { - this.field2504[this.indicesCount] = (byte)(this.field2570 + var8.field2504[var9]); + if (var6) { // L: 146 + if (var8.field2566 != null && var8.field2566[var9] != -1) { // L: 147 + this.field2566[this.indicesCount] = (byte)(this.field2522 + var8.field2566[var9]); } else { - this.field2504[this.indicesCount] = -1; + this.field2566[this.indicesCount] = -1; // L: 148 } } - ++this.indicesCount; + ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field2570; ++var9) { - this.field2525[this.field2570] = this.verticesCount + var8.field2525[var9]; - this.field2526[this.field2570] = this.verticesCount + var8.field2526[var9]; - this.field2527[this.field2570] = this.verticesCount + var8.field2527[var9]; - ++this.field2570; + for (var9 = 0; var9 < var8.field2522; ++var9) { // L: 152 + this.field2529[this.field2522] = this.verticesCount + var8.field2529[var9]; // L: 153 + this.field2530[this.field2522] = this.verticesCount + var8.field2530[var9]; // L: 154 + this.field2538[this.field2522] = this.verticesCount + var8.field2538[var9]; // L: 155 + ++this.field2522; // L: 156 } - 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; + for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 + this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 159 + this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 160 + this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 161 + ++this.verticesCount; // L: 162 } } } - } + } // L: 166 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([[IIIIZI)Lhl;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - 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]) { + this.calculateBoundsCylinder(); // L: 169 + int var7 = var2 - this.xzRadius; // L: 170 + int var8 = var2 + this.xzRadius; // L: 171 + int var9 = var4 - this.xzRadius; // L: 172 + int var10 = var4 + this.xzRadius; // L: 173 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 174 + var7 >>= 7; // L: 175 + var8 = var8 + 127 >> 7; // L: 176 + var9 >>= 7; // L: 177 + var10 = var10 + 127 >> 7; // L: 178 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 179 return this; } else { Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field2570 = this.field2570; - 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.field2504 = this.field2504; - var11.faceTextures = this.faceTextures; - var11.field2523 = this.field2523; - var11.field2525 = this.field2525; - var11.field2526 = this.field2526; - var11.field2527 = this.field2527; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; + if (var5) { // L: 181 + var11 = new Model(); // L: 182 + var11.verticesCount = this.verticesCount; // L: 183 + var11.indicesCount = this.indicesCount; // L: 184 + var11.field2522 = this.field2522; // L: 185 + var11.verticesX = this.verticesX; // L: 186 + var11.verticesZ = this.verticesZ; // L: 187 + var11.indices1 = this.indices1; // L: 188 + var11.indices2 = this.indices2; // L: 189 + var11.indices3 = this.indices3; // L: 190 + var11.faceColors1 = this.faceColors1; // L: 191 + var11.faceColors2 = this.faceColors2; // L: 192 + var11.faceColors3 = this.faceColors3; // L: 193 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 + var11.faceAlphas = this.faceAlphas; // L: 195 + var11.field2566 = this.field2566; // L: 196 + var11.faceTextures = this.faceTextures; // L: 197 + var11.field2527 = this.field2527; // L: 198 + var11.field2529 = this.field2529; // L: 199 + var11.field2530 = this.field2530; // L: 200 + var11.field2538 = this.field2538; // L: 201 + var11.vertexLabels = this.vertexLabels; // L: 202 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 + var11.isSingleTile = this.isSingleTile; // L: 204 + var11.verticesY = new int[var11.verticesCount]; // L: 205 } else { - var11 = this; + var11 = this; // L: 208 } int var12; @@ -422,495 +422,495 @@ public class Model extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + if (var6 == 0) { // L: 210 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 211 + var13 = var2 + this.verticesX[var12]; // L: 212 + var14 = var4 + this.verticesZ[var12]; // L: 213 + var15 = var13 & 127; // L: 214 + var16 = var14 & 127; // L: 215 + var17 = var13 >> 7; // L: 216 + var18 = var14 >> 7; // L: 217 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 218 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 219 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 220 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 221 } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 226 + if (var13 < var6) { // L: 227 + var14 = var2 + this.verticesX[var12]; // L: 228 + var15 = var4 + this.verticesZ[var12]; // L: 229 + var16 = var14 & 127; // L: 230 + var17 = var15 & 127; // L: 231 + var18 = var14 >> 7; // L: 232 + var19 = var15 >> 7; // L: 233 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 234 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 235 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 236 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 237 } } } - var11.resetBounds(); - return var11; + var11.resetBounds(); // L: 241 + return var11; // L: 242 } } else { return this; } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Z)Lhl;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246 Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Z)Lhl;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251 Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(ZLhl;[B)Lhl;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { - var2.verticesCount = this.verticesCount; - var2.indicesCount = this.indicesCount; - var2.field2570 = this.field2570; - 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]; + var2.verticesCount = this.verticesCount; // L: 256 + var2.indicesCount = this.indicesCount; // L: 257 + var2.field2522 = this.field2522; // L: 258 + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259 + var2.verticesX = new int[this.verticesCount + 100]; // L: 260 + var2.verticesY = new int[this.verticesCount + 100]; // L: 261 + var2.verticesZ = new int[this.verticesCount + 100]; // L: 262 } int var4; - 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]; + for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 264 + var2.verticesX[var4] = this.verticesX[var4]; // L: 265 + var2.verticesY[var4] = this.verticesY[var4]; // L: 266 + var2.verticesZ[var4] = this.verticesZ[var4]; // L: 267 } - if (var1) { + if (var1) { // L: 269 var2.faceAlphas = this.faceAlphas; } else { - var2.faceAlphas = var3; - if (this.faceAlphas == null) { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + var2.faceAlphas = var3; // L: 271 + if (this.faceAlphas == null) { // L: 272 + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 273 var2.faceAlphas[var4] = 0; } } else { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 276 var2.faceAlphas[var4] = this.faceAlphas[var4]; } } } - 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.field2504 = this.field2504; - var2.faceTextures = this.faceTextures; - var2.field2523 = this.field2523; - var2.field2525 = this.field2525; - var2.field2526 = this.field2526; - var2.field2527 = this.field2527; - var2.vertexLabels = this.vertexLabels; - var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.isSingleTile = this.isSingleTile; - var2.resetBounds(); - return var2; + var2.indices1 = this.indices1; // L: 279 + var2.indices2 = this.indices2; // L: 280 + var2.indices3 = this.indices3; // L: 281 + var2.faceColors1 = this.faceColors1; // L: 282 + var2.faceColors2 = this.faceColors2; // L: 283 + var2.faceColors3 = this.faceColors3; // L: 284 + var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 + var2.field2566 = this.field2566; // L: 286 + var2.faceTextures = this.faceTextures; // L: 287 + var2.field2527 = this.field2527; // L: 288 + var2.field2529 = this.field2529; // L: 289 + var2.field2530 = this.field2530; // L: 290 + var2.field2538 = this.field2538; // L: 291 + var2.vertexLabels = this.vertexLabels; // L: 292 + var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 + var2.isSingleTile = this.isSingleTile; // L: 294 + var2.resetBounds(); // L: 295 + return var2; // L: 296 } - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if (this.xMidOffset == -1) { - int var2 = 0; - int var3 = 0; - int var4 = 0; - int var5 = 0; - int var6 = 0; - int var7 = 0; - int var8 = Model_cosine[var1]; - int var9 = Model_sine[var1]; + if (this.xMidOffset == -1) { // L: 300 + int var2 = 0; // L: 301 + int var3 = 0; // L: 302 + int var4 = 0; // L: 303 + int var5 = 0; // L: 304 + int var6 = 0; // L: 305 + int var7 = 0; // L: 306 + int var8 = Model_cosine[var1]; // L: 307 + int var9 = Model_sine[var1]; // L: 308 - for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method4137(this.verticesX[var10], this.verticesZ[var10], var8, var9); - int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method4138(this.verticesX[var10], this.verticesZ[var10], var8, var9); - if (var11 < var2) { + for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 + int var11 = Rasterizer3D.method4220(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var12 = this.verticesY[var10]; // L: 311 + int var13 = Rasterizer3D.method4243(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + if (var11 < var2) { // L: 313 var2 = var11; } - if (var11 > var5) { + if (var11 > var5) { // L: 314 var5 = var11; } - if (var12 < var3) { + if (var12 < var3) { // L: 315 var3 = var12; } - if (var12 > var6) { + if (var12 > var6) { // L: 316 var6 = var12; } - if (var13 < var4) { + if (var13 < var4) { // L: 317 var4 = var13; } - if (var13 > var7) { + if (var13 > var7) { // L: 318 var7 = var13; } } - this.xMid = (var5 + var2) / 2; - this.yMid = (var6 + var3) / 2; - this.zMid = (var7 + var4) / 2; - this.xMidOffset = (var5 - var2 + 1) / 2; - this.yMidOffset = (var6 - var3 + 1) / 2; - this.zMidOffset = (var7 - var4 + 1) / 2; - if (this.xMidOffset < 32) { + this.xMid = (var5 + var2) / 2; // L: 320 + this.yMid = (var6 + var3) / 2; // L: 321 + this.zMid = (var7 + var4) / 2; // L: 322 + this.xMidOffset = (var5 - var2 + 1) / 2; // L: 323 + this.yMidOffset = (var6 - var3 + 1) / 2; // L: 324 + this.zMidOffset = (var7 - var4 + 1) / 2; // L: 325 + if (this.xMidOffset < 32) { // L: 327 this.xMidOffset = 32; } - if (this.zMidOffset < 32) { + if (this.zMidOffset < 32) { // L: 328 this.zMidOffset = 32; } - if (this.isSingleTile) { - this.xMidOffset += 8; - this.zMidOffset += 8; + if (this.isSingleTile) { // L: 329 + this.xMidOffset += 8; // L: 331 + this.zMidOffset += 8; // L: 332 } } - } + } // L: 334 - @ObfuscatedName("a") + @ObfuscatedName("x") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if (this.boundsType != 1) { - this.boundsType = 1; - super.height = 0; - this.bottomY = 0; - this.xzRadius = 0; + if (this.boundsType != 1) { // L: 337 + this.boundsType = 1; // L: 338 + super.height = 0; // L: 339 + this.bottomY = 0; // L: 340 + this.xzRadius = 0; // L: 341 - 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) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 342 + int var2 = this.verticesX[var1]; // L: 343 + int var3 = this.verticesY[var1]; // L: 344 + int var4 = this.verticesZ[var1]; // L: 345 + if (-var3 > super.height) { // L: 346 super.height = -var3; } - if (var3 > this.bottomY) { + if (var3 > this.bottomY) { // L: 347 this.bottomY = var3; } - int var5 = var2 * var2 + var4 * var4; - if (var5 > this.xzRadius) { + int var5 = var2 * var2 + var4 * var4; // L: 348 + if (var5 > this.xzRadius) { // L: 349 this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); - this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 351 + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 352 + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 353 } - } - - @ObfuscatedName("e") - void method4442() { - if (this.boundsType != 2) { - this.boundsType = 2; - this.xzRadius = 0; - - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - int var5 = var2 * var2 + var4 * var4 + var3 * var3; - if (var5 > this.xzRadius) { - this.xzRadius = var5; - } - } - - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = this.xzRadius; - this.diameter = this.xzRadius + this.xzRadius; - } - } - - @ObfuscatedName("i") - public int method4468() { - this.calculateBoundsCylinder(); - return this.xzRadius; - } + } // L: 354 @ObfuscatedName("y") - @Export("resetBounds") - void resetBounds() { - this.boundsType = 0; - this.xMidOffset = -1; + void method4534() { + if (this.boundsType != 2) { // L: 357 + this.boundsType = 2; // L: 358 + this.xzRadius = 0; // L: 359 + + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 360 + int var2 = this.verticesX[var1]; // L: 361 + int var3 = this.verticesY[var1]; // L: 362 + int var4 = this.verticesZ[var1]; // L: 363 + int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 364 + if (var5 > this.xzRadius) { // L: 365 + this.xzRadius = var5; + } + } + + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 367 + this.radius = this.xzRadius; // L: 368 + this.diameter = this.xzRadius + this.xzRadius; // L: 369 + } + } // L: 370 + + @ObfuscatedName("k") + public int method4536() { + this.calculateBoundsCylinder(); // L: 373 + return this.xzRadius; // L: 374 } - @ObfuscatedName("w") + @ObfuscatedName("t") + @Export("resetBounds") + void resetBounds() { + this.boundsType = 0; // L: 378 + this.xMidOffset = -1; // L: 379 + } // L: 380 + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lht;I)V" + descriptor = "(Lho;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { - 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; + if (this.vertexLabels != null) { // L: 383 + if (var2 != -1) { // L: 384 + Animation var3 = var1.frames[var2]; // L: 385 + Skeleton var4 = var3.skeleton; // L: 386 + Model_transformTempX = 0; // L: 387 + Model_transformTempY = 0; // L: 388 + Model_transformTempZ = 0; // L: 389 - for (int var5 = 0; var5 < var3.transformCount; ++var5) { - int var6 = var3.transformSkeletonLabels[var5]; - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); + for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 390 + int var6 = var3.transformSkeletonLabels[var5]; // L: 391 + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 392 } - this.resetBounds(); + this.resetBounds(); // L: 394 } } - } + } // L: 395 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lht;ILht;I[I)V" + descriptor = "(Lho;ILho;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - 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; + if (var2 != -1) { // L: 398 + if (var5 != null && var4 != -1) { // L: 399 + Animation var6 = var1.frames[var2]; // L: 403 + Animation var7 = var3.frames[var4]; // L: 404 + Skeleton var8 = var6.skeleton; // L: 405 + Model_transformTempX = 0; // L: 406 + Model_transformTempY = 0; // L: 407 + Model_transformTempZ = 0; // L: 408 + byte var9 = 0; // L: 409 + int var13 = var9 + 1; // L: 410 int var10 = var5[var9]; int var11; int var12; - for (var11 = 0; var11 < var6.transformCount; ++var11) { - for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 411 + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 412 413 } - if (var12 != var10 || var8.transformTypes[var12] == 0) { + if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 414 this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); } } - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; - var9 = 0; - var13 = var9 + 1; + Model_transformTempX = 0; // L: 416 + Model_transformTempY = 0; // L: 417 + Model_transformTempZ = 0; // L: 418 + var9 = 0; // L: 419 + var13 = var9 + 1; // L: 420 var10 = var5[var9]; - for (var11 = 0; var11 < var7.transformCount; ++var11) { - for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 421 + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 422 423 } - if (var12 == var10 || var8.transformTypes[var12] == 0) { + if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 424 this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); } } - this.resetBounds(); + this.resetBounds(); // L: 426 } else { - this.animate(var1, var2); + this.animate(var1, var2); // L: 400 } } - } + } // L: 401 427 - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; + int var6 = var2.length; // L: 430 int var7; int var8; int var11; int var12; - if (var1 == 0) { - var7 = 0; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + if (var1 == 0) { // L: 431 + var7 = 0; // L: 432 + Model_transformTempX = 0; // L: 433 + Model_transformTempY = 0; // L: 434 + Model_transformTempZ = 0; // L: 435 - for (var8 = 0; var8 < var6; ++var8) { - int var18 = var2[var8]; - if (var18 < this.vertexLabels.length) { - int[] var19 = this.vertexLabels[var18]; + for (var8 = 0; var8 < var6; ++var8) { // L: 436 + int var18 = var2[var8]; // L: 437 + if (var18 < this.vertexLabels.length) { // L: 438 + int[] var19 = this.vertexLabels[var18]; // L: 439 - 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; + for (var11 = 0; var11 < var19.length; ++var11) { // L: 440 + var12 = var19[var11]; // L: 441 + Model_transformTempX += this.verticesX[var12]; // L: 442 + Model_transformTempY += this.verticesY[var12]; // L: 443 + Model_transformTempZ += this.verticesZ[var12]; // L: 444 + ++var7; // L: 445 } } } - if (var7 > 0) { - Model_transformTempX = var3 + Model_transformTempX / var7; - Model_transformTempY = var4 + Model_transformTempY / var7; - Model_transformTempZ = var5 + Model_transformTempZ / var7; + if (var7 > 0) { // L: 449 + Model_transformTempX = var3 + Model_transformTempX / var7; // L: 450 + Model_transformTempY = var4 + Model_transformTempY / var7; // L: 451 + Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 452 } else { - Model_transformTempX = var3; - Model_transformTempY = var4; - Model_transformTempZ = var5; + Model_transformTempX = var3; // L: 455 + Model_transformTempY = var4; // L: 456 + Model_transformTempZ = var5; // L: 457 } } else { int[] var9; int var10; int[] var10000; - if (var1 == 1) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + if (var1 == 1) { // L: 461 + for (var7 = 0; var7 < var6; ++var7) { // L: 462 + var8 = var2[var7]; // L: 463 + if (var8 < this.vertexLabels.length) { // L: 464 + var9 = this.vertexLabels[var8]; // L: 465 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 466 + var11 = var9[var10]; // L: 467 + var10000 = this.verticesX; // L: 468 var10000[var11] += var3; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 469 var10000[var11] += var4; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 470 var10000[var11] += var5; } } } - } else if (var1 == 2) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + } else if (var1 == 2) { // L: 476 + for (var7 = 0; var7 < var6; ++var7) { // L: 477 + var8 = var2[var7]; // L: 478 + if (var8 < this.vertexLabels.length) { // L: 479 + var9 = this.vertexLabels[var8]; // L: 480 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 481 + var11 = var9[var10]; // L: 482 + var10000 = this.verticesX; // L: 483 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 484 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 485 var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; + var12 = (var3 & 255) * 8; // L: 486 + int var13 = (var4 & 255) * 8; // L: 487 + int var14 = (var5 & 255) * 8; // L: 488 int var15; int var16; int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + if (var14 != 0) { // L: 489 + var15 = Model_sine[var14]; // L: 490 + var16 = Model_cosine[var14]; // L: 491 + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 492 + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 493 + this.verticesX[var11] = var17; // L: 494 } - if (var12 != 0) { - var15 = Model_sine[var12]; - var16 = Model_cosine[var12]; - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; - this.verticesY[var11] = var17; + if (var12 != 0) { // L: 496 + var15 = Model_sine[var12]; // L: 497 + var16 = Model_cosine[var12]; // L: 498 + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 499 + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 500 + this.verticesY[var11] = var17; // L: 501 } - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + if (var13 != 0) { // L: 503 + var15 = Model_sine[var13]; // L: 504 + var16 = Model_cosine[var13]; // L: 505 + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 506 + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 507 + this.verticesX[var11] = var17; // L: 508 } - var10000 = this.verticesX; + var10000 = this.verticesX; // L: 510 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 511 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 512 var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 3) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + } else if (var1 == 3) { // L: 518 + for (var7 = 0; var7 < var6; ++var7) { // L: 519 + var8 = var2[var7]; // L: 520 + if (var8 < this.vertexLabels.length) { // L: 521 + var9 = this.vertexLabels[var8]; // L: 522 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 523 + var11 = var9[var10]; // L: 524 + var10000 = this.verticesX; // L: 525 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 526 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 527 var10000[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; - var10000 = this.verticesX; + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 528 + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 529 + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 530 + var10000 = this.verticesX; // L: 531 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 532 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 533 var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 5) { - if (this.faceLabelsAlpha != null && this.faceAlphas != null) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.faceLabelsAlpha.length) { - var9 = this.faceLabelsAlpha[var8]; + } else if (var1 == 5) { // L: 539 + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 540 + for (var7 = 0; var7 < var6; ++var7) { // L: 541 + var8 = var2[var7]; // L: 542 + if (var8 < this.faceLabelsAlpha.length) { // L: 543 + var9 = this.faceLabelsAlpha[var8]; // L: 544 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if (var12 < 0) { + for (var10 = 0; var10 < var9.length; ++var10) { // L: 545 + var11 = var9[var10]; // L: 546 + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 547 + if (var12 < 0) { // L: 548 var12 = 0; - } else if (var12 > 255) { + } else if (var12 > 255) { // L: 549 var12 = 255; } - this.faceAlphas[var11] = (byte)var12; + this.faceAlphas[var11] = (byte)var12; // L: 550 } } } @@ -918,223 +918,223 @@ public class Model extends Renderable { } } - } + } // L: 459 474 516 537 555 557 - @ObfuscatedName("s") + @ObfuscatedName("z") @Export("rotateY90Ccw") public void rotateY90Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - this.verticesX[var1] = this.verticesZ[var1]; - this.verticesZ[var1] = -var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 + int var2 = this.verticesX[var1]; // L: 561 + this.verticesX[var1] = this.verticesZ[var1]; // L: 562 + this.verticesZ[var1] = -var2; // L: 563 } - this.resetBounds(); - } + this.resetBounds(); // L: 565 + } // L: 566 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("rotateY180") public void rotateY180() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - this.verticesX[var1] = -this.verticesX[var1]; - this.verticesZ[var1] = -this.verticesZ[var1]; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 + this.verticesX[var1] = -this.verticesX[var1]; // L: 570 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 571 } - this.resetBounds(); - } + this.resetBounds(); // L: 573 + } // L: 574 - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("rotateY270Ccw") public void rotateY270Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesZ[var1]; - this.verticesZ[var1] = this.verticesX[var1]; - this.verticesX[var1] = -var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 + int var2 = this.verticesZ[var1]; // L: 578 + this.verticesZ[var1] = this.verticesX[var1]; // L: 579 + this.verticesX[var1] = -var2; // L: 580 } - this.resetBounds(); - } + this.resetBounds(); // L: 582 + } // L: 583 - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = Model_sine[var1]; - int var3 = Model_cosine[var1]; + int var2 = Model_sine[var1]; // L: 586 + int var3 = Model_cosine[var1]; // L: 587 - 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; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 588 + int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 589 + this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 590 + this.verticesY[var4] = var5; // L: 591 } - this.resetBounds(); - } + this.resetBounds(); // L: 593 + } // L: 594 - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 + int[] var10000 = this.verticesX; // L: 598 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 599 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 600 var10000[var4] += var3; } - this.resetBounds(); - } + this.resetBounds(); // L: 602 + } // L: 603 - @ObfuscatedName("z") + @ObfuscatedName("c") @Export("scale") public void scale(int var1, int var2, int var3) { - 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; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 608 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 609 } - this.resetBounds(); - } + this.resetBounds(); // L: 611 + } // L: 612 + + @ObfuscatedName("f") + public final void method4539(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2556[0] = -1; // L: 615 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 + this.method4534(); + } + + int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 + int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 618 + int var10 = Model_sine[var1]; // L: 619 + int var11 = Model_cosine[var1]; // L: 620 + int var12 = Model_sine[var2]; // L: 621 + int var13 = Model_cosine[var2]; // L: 622 + int var14 = Model_sine[var3]; // L: 623 + int var15 = Model_cosine[var3]; // L: 624 + int var16 = Model_sine[var4]; // L: 625 + int var17 = Model_cosine[var4]; // L: 626 + int var18 = var16 * var6 + var17 * var7 >> 16; // L: 627 + + for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 628 + int var20 = this.verticesX[var19]; // L: 629 + int var21 = this.verticesY[var19]; // L: 630 + int var22 = this.verticesZ[var19]; // L: 631 + int var23; + if (var3 != 0) { // L: 632 + var23 = var21 * var14 + var20 * var15 >> 16; // L: 633 + var21 = var21 * var15 - var20 * var14 >> 16; // L: 634 + var20 = var23; // L: 635 + } + + if (var1 != 0) { // L: 637 + var23 = var21 * var11 - var22 * var10 >> 16; // L: 638 + var22 = var21 * var10 + var22 * var11 >> 16; // L: 639 + var21 = var23; // L: 640 + } + + if (var2 != 0) { // L: 642 + var23 = var22 * var12 + var20 * var13 >> 16; // L: 643 + var22 = var22 * var13 - var20 * var12 >> 16; // L: 644 + var20 = var23; // L: 645 + } + + var20 += var5; // L: 647 + var21 += var6; // L: 648 + var22 += var7; // L: 649 + var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 + var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 + field2551[var19] = var22 - var18; // L: 653 + modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654 + modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655 + if (this.field2522 > 0) { // L: 656 + field2574[var19] = var20; // L: 657 + field2547[var19] = var23; // L: 658 + field2575[var19] = var22; // L: 659 + } + } + + try { + this.draw0(false, false, false, 0L); // L: 663 + } catch (Exception var25) { // L: 665 + } + + } // L: 666 @ObfuscatedName("h") - public final void method4454(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2539[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method4442(); + public final void method4525(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2556[0] = -1; // L: 669 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 + this.method4534(); } - int var8 = Rasterizer3D.Rasterizer3D_clipMidX; - int var9 = Rasterizer3D.Rasterizer3D_clipMidY; - int var10 = Model_sine[var1]; - int var11 = Model_cosine[var1]; - int var12 = Model_sine[var2]; - int var13 = Model_cosine[var2]; - int var14 = Model_sine[var3]; - int var15 = Model_cosine[var3]; - int var16 = Model_sine[var4]; - int var17 = Model_cosine[var4]; - int var18 = var16 * var6 + var17 * var7 >> 16; + int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 + int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 672 + int var11 = Model_sine[var1]; // L: 673 + int var12 = Model_cosine[var1]; // L: 674 + int var13 = Model_sine[var2]; // L: 675 + int var14 = Model_cosine[var2]; // L: 676 + int var15 = Model_sine[var3]; // L: 677 + int var16 = Model_cosine[var3]; // L: 678 + int var17 = Model_sine[var4]; // L: 679 + int var18 = Model_cosine[var4]; // L: 680 + int var19 = var17 * var6 + var18 * var7 >> 16; // L: 681 - 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) { - var23 = var21 * var14 + var20 * var15 >> 16; - var21 = var21 * var15 - var20 * var14 >> 16; - var20 = var23; - } - - if (var1 != 0) { - var23 = var21 * var11 - var22 * var10 >> 16; - var22 = var21 * var10 + var22 * var11 >> 16; - var21 = var23; - } - - if (var2 != 0) { - var23 = var22 * var12 + var20 * var13 >> 16; - var22 = var22 * var13 - var20 * var12 >> 16; - var20 = var23; - } - - var20 += var5; - var21 += var6; - var22 += var7; - var23 = var21 * var17 - var22 * var16 >> 16; - var22 = var21 * var16 + var22 * var17 >> 16; - field2547[var19] = var22 - var18; - modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; - modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field2570 > 0) { - field2548[var19] = var20; - field2549[var19] = var23; - field2514[var19] = var22; - } - } - - try { - this.draw0(false, false, false, 0L); - } catch (Exception var25) { - } - - } - - @ObfuscatedName("o") - public final void method4483(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2539[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method4442(); - } - - int var9 = Rasterizer3D.Rasterizer3D_clipMidX; - int var10 = Rasterizer3D.Rasterizer3D_clipMidY; - int var11 = Model_sine[var1]; - int var12 = Model_cosine[var1]; - int var13 = Model_sine[var2]; - int var14 = Model_cosine[var2]; - int var15 = Model_sine[var3]; - int var16 = Model_cosine[var3]; - int var17 = Model_sine[var4]; - int var18 = Model_cosine[var4]; - int var19 = var17 * var6 + var18 * var7 >> 16; - - for (int var20 = 0; var20 < this.verticesCount; ++var20) { - int var21 = this.verticesX[var20]; - int var22 = this.verticesY[var20]; - int var23 = this.verticesZ[var20]; + for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 682 + int var21 = this.verticesX[var20]; // L: 683 + int var22 = this.verticesY[var20]; // L: 684 + int var23 = this.verticesZ[var20]; // L: 685 int var24; - if (var3 != 0) { - var24 = var22 * var15 + var21 * var16 >> 16; - var22 = var22 * var16 - var21 * var15 >> 16; - var21 = var24; + if (var3 != 0) { // L: 686 + var24 = var22 * var15 + var21 * var16 >> 16; // L: 687 + var22 = var22 * var16 - var21 * var15 >> 16; // L: 688 + var21 = var24; // L: 689 } - if (var1 != 0) { - var24 = var22 * var12 - var23 * var11 >> 16; - var23 = var22 * var11 + var23 * var12 >> 16; - var22 = var24; + if (var1 != 0) { // L: 691 + var24 = var22 * var12 - var23 * var11 >> 16; // L: 692 + var23 = var22 * var11 + var23 * var12 >> 16; // L: 693 + var22 = var24; // L: 694 } - if (var2 != 0) { - var24 = var23 * var13 + var21 * var14 >> 16; - var23 = var23 * var14 - var21 * var13 >> 16; - var21 = var24; + if (var2 != 0) { // L: 696 + var24 = var23 * var13 + var21 * var14 >> 16; // L: 697 + var23 = var23 * var14 - var21 * var13 >> 16; // L: 698 + var21 = var24; // L: 699 } - var21 += var5; - var22 += var6; - var23 += var7; - var24 = var22 * var18 - var23 * var17 >> 16; - var23 = var22 * var17 + var23 * var18 >> 16; - field2547[var20] = var23 - var19; - modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; - modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field2570 > 0) { - field2548[var20] = var21; - field2549[var20] = var24; - field2514[var20] = var23; + var21 += var5; // L: 701 + var22 += var6; // L: 702 + var23 += var7; // L: 703 + var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 + var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 + field2551[var20] = var23 - var19; // L: 707 + modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708 + modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709 + if (this.field2522 > 0) { // L: 710 + field2574[var20] = var21; // L: 711 + field2547[var20] = var24; // L: 712 + field2575[var20] = var23; // L: 713 } } try { - this.draw0(false, false, false, 0L); - } catch (Exception var26) { + this.draw0(false, false, false, 0L); // L: 717 + } catch (Exception var26) { // L: 719 } - } + } // L: 720 - @ObfuscatedName("r") + @ObfuscatedName("v") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { + if (this.diameter < 1600) { // L: 922 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { - field2539[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 923 + field2556[var6] = 0; } - var6 = var3 ? 20 : 5; + var6 = var3 ? 20 : 5; // L: 924 int var7; int var8; @@ -1146,582 +1146,652 @@ public class Model extends Renderable { int var16; int var18; int var28; - 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]; + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 925 + if (this.faceColors3[var7] != -2) { // L: 926 + var8 = this.indices1[var7]; // L: 927 + var9 = this.indices2[var7]; // L: 928 + var10 = this.indices3[var7]; // L: 929 + var11 = modelViewportXs[var8]; // L: 930 + var12 = modelViewportXs[var9]; // L: 931 + var28 = modelViewportXs[var10]; // L: 932 int var29; int var30; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var9]; - var29 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 933 + if (var2) { // L: 959 + var15 = modelViewportYs[var8]; // L: 961 + var16 = modelViewportYs[var9]; // L: 962 + var30 = modelViewportYs[var10]; // L: 963 + var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 965 boolean var34; - if (var18 < var15 && var18 < var16 && var18 < var29) { - var34 = false; + if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 966 + var34 = false; // L: 967 } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var29) { - var34 = false; + var18 = ViewportMouse.ViewportMouse_y - var6; // L: 970 + if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 971 + var34 = false; // L: 972 } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var28) { - var34 = false; + var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 975 + if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 976 + var34 = false; // L: 977 } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var28) { - var34 = false; + var18 = ViewportMouse.ViewportMouse_x - var6; // L: 980 + if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 981 + var34 = false; // L: 982 } else { - var34 = true; + var34 = true; // L: 985 } } } } - if (var34) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; + if (var34) { // L: 987 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 990 + var2 = false; // L: 992 } } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2544[var7] = false; - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field2543[var7] = false; + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 995 + field2548[var7] = false; // L: 996 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 997 + field2554[var7] = false; // L: 998 } else { - field2543[var7] = true; + field2554[var7] = true; } - var30 = (field2547[var8] + field2547[var9] + field2547[var10]) / 3 + this.radius; - field2553[var30][field2539[var30]++] = var7; + var29 = (field2551[var8] + field2551[var9] + field2551[var10]) / 3 + this.radius; // L: 999 + field2557[var29][field2556[var29]++] = var7; // L: 1000 } } else { - var30 = field2548[var8]; - var15 = field2548[var9]; - var16 = field2548[var10]; - var29 = field2549[var8]; - var18 = field2549[var9]; - int var19 = field2549[var10]; - int var20 = field2514[var8]; - int var21 = field2514[var9]; - int var22 = field2514[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) { - field2544[var7] = true; - int var26 = (field2547[var8] + field2547[var9] + field2547[var10]) / 3 + this.radius; - field2553[var26][field2539[var26]++] = var7; + var29 = field2574[var8]; // L: 934 + var15 = field2574[var9]; // L: 935 + var16 = field2574[var10]; // L: 936 + var30 = field2547[var8]; // L: 937 + var18 = field2547[var9]; // L: 938 + int var19 = field2547[var10]; // L: 939 + int var20 = field2575[var8]; // L: 940 + int var21 = field2575[var9]; // L: 941 + int var22 = field2575[var10]; // L: 942 + var29 -= var15; // L: 943 + var16 -= var15; // L: 944 + var30 -= var18; // L: 945 + var19 -= var18; // L: 946 + var20 -= var21; // L: 947 + var22 -= var21; // L: 948 + int var23 = var30 * var22 - var20 * var19; // L: 949 + int var24 = var20 * var16 - var29 * var22; // L: 950 + int var25 = var29 * var19 - var30 * var16; // L: 951 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 952 + field2548[var7] = true; // L: 953 + int var26 = (field2551[var8] + field2551[var9] + field2551[var10]) / 3 + this.radius; // L: 954 + field2557[var26][field2556[var26]++] = var7; // L: 955 } } } } int[] var27; - if (this.faceRenderPriorities == null) { - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2539[var7]; - if (var8 > 0) { - var27 = field2553[var7]; + if (this.faceRenderPriorities == null) { // L: 1004 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1005 + var8 = field2556[var7]; // L: 1006 + if (var8 > 0) { // L: 1007 + var27 = field2557[var7]; // L: 1008 - for (var10 = 0; var10 < var8; ++var10) { + for (var10 = 0; var10 < var8; ++var10) { // L: 1009 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { - field2554[var7] = 0; - field2558[var7] = 0; + for (var7 = 0; var7 < 12; ++var7) { // L: 1014 + field2558[var7] = 0; // L: 1015 + field2528[var7] = 0; // L: 1016 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2539[var7]; - if (var8 > 0) { - var27 = field2553[var7]; + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1018 + var8 = field2556[var7]; // L: 1019 + if (var8 > 0) { // L: 1020 + var27 = field2557[var7]; // L: 1021 - for (var10 = 0; var10 < var8; ++var10) { - var11 = var27[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var28 = field2554[var33]++; - field2555[var33][var28] = var11; - if (var33 < 10) { - int[] var10000 = field2558; + for (var10 = 0; var10 < var8; ++var10) { // L: 1022 + var11 = var27[var10]; // L: 1023 + byte var33 = this.faceRenderPriorities[var11]; // L: 1024 + var28 = field2558[var33]++; // L: 1025 + field2559[var33][var28] = var11; // L: 1026 + if (var33 < 10) { // L: 1027 + int[] var10000 = field2528; var10000[var33] += var7; - } else if (var33 == 10) { - field2556[var28] = var7; + } else if (var33 == 10) { // L: 1028 + field2560[var28] = var7; } else { - field2557[var28] = var7; + field2561[var28] = var7; // L: 1029 } } } } - var7 = 0; - if (field2554[1] > 0 || field2554[2] > 0) { - var7 = (field2558[1] + field2558[2]) / (field2554[1] + field2554[2]); + var7 = 0; // L: 1033 + if (field2558[1] > 0 || field2558[2] > 0) { // L: 1034 + var7 = (field2528[1] + field2528[2]) / (field2558[1] + field2558[2]); } - var8 = 0; - if (field2554[3] > 0 || field2554[4] > 0) { - var8 = (field2558[3] + field2558[4]) / (field2554[3] + field2554[4]); + var8 = 0; // L: 1035 + if (field2558[3] > 0 || field2558[4] > 0) { // L: 1036 + var8 = (field2528[3] + field2528[4]) / (field2558[3] + field2558[4]); } - var9 = 0; - if (field2554[6] > 0 || field2554[8] > 0) { - var9 = (field2558[8] + field2558[6]) / (field2554[8] + field2554[6]); + var9 = 0; // L: 1037 + if (field2558[6] > 0 || field2558[8] > 0) { // L: 1038 + var9 = (field2528[8] + field2528[6]) / (field2558[8] + field2558[6]); } - var11 = 0; - var12 = field2554[10]; - int[] var13 = field2555[10]; - int[] var14 = field2556; - if (var11 == var12) { - var11 = 0; - var12 = field2554[11]; - var13 = field2555[11]; - var14 = field2557; + var11 = 0; // L: 1040 + var12 = field2558[10]; // L: 1041 + int[] var13 = field2559[10]; // L: 1042 + int[] var14 = field2560; // L: 1043 + if (var11 == var12) { // L: 1044 + var11 = 0; // L: 1045 + var12 = field2558[11]; // L: 1046 + var13 = field2559[11]; // L: 1047 + var14 = field2561; // L: 1048 } - if (var11 < var12) { + if (var11 < var12) { // L: 1050 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1051 } - for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var7) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2555[11]) { - var11 = 0; - var12 = field2554[11]; - var13 = field2555[11]; - var14 = field2557; + for (var15 = 0; var15 < 10; ++var15) { // L: 1052 + while (var15 == 0 && var10 > var7) { // L: 1053 + this.drawFace(var13[var11++]); // L: 1054 + if (var11 == var12 && var13 != field2559[11]) { // L: 1055 + var11 = 0; // L: 1056 + var12 = field2558[11]; // L: 1057 + var13 = field2559[11]; // L: 1058 + var14 = field2561; // L: 1059 } - if (var11 < var12) { + if (var11 < var12) { // L: 1061 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1062 } } - while (var15 == 3 && var10 > var8) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2555[11]) { - var11 = 0; - var12 = field2554[11]; - var13 = field2555[11]; - var14 = field2557; + while (var15 == 3 && var10 > var8) { // L: 1064 + this.drawFace(var13[var11++]); // L: 1065 + if (var11 == var12 && var13 != field2559[11]) { // L: 1066 + var11 = 0; // L: 1067 + var12 = field2558[11]; // L: 1068 + var13 = field2559[11]; // L: 1069 + var14 = field2561; // L: 1070 } - if (var11 < var12) { + if (var11 < var12) { // L: 1072 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1073 } } - while (var15 == 5 && var10 > var9) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2555[11]) { - var11 = 0; - var12 = field2554[11]; - var13 = field2555[11]; - var14 = field2557; + while (var15 == 5 && var10 > var9) { // L: 1075 + this.drawFace(var13[var11++]); // L: 1076 + if (var11 == var12 && var13 != field2559[11]) { // L: 1077 + var11 = 0; // L: 1078 + var12 = field2558[11]; // L: 1079 + var13 = field2559[11]; // L: 1080 + var14 = field2561; // L: 1081 } - if (var11 < var12) { + if (var11 < var12) { // L: 1083 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1084 } } - var16 = field2554[var15]; - int[] var17 = field2555[var15]; + var16 = field2558[var15]; // L: 1086 + int[] var17 = field2559[var15]; // L: 1087 - for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var17[var18]); + for (var18 = 0; var18 < var16; ++var18) { // L: 1088 + this.drawFace(var17[var18]); // L: 1089 } } - while (var10 != -1000) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2555[11]) { - var11 = 0; - var13 = field2555[11]; - var12 = field2554[11]; - var14 = field2557; + while (var10 != -1000) { // L: 1092 + this.drawFace(var13[var11++]); // L: 1093 + if (var11 == var12 && var13 != field2559[11]) { // L: 1094 + var11 = 0; // L: 1095 + var13 = field2559[11]; // L: 1096 + var12 = field2558[11]; // L: 1097 + var14 = field2561; // L: 1098 } - if (var11 < var12) { + if (var11 < var12) { // L: 1100 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1101 } } } } - } + } // L: 1012 1103 - @ObfuscatedName("n") + @ObfuscatedName("ag") @Export("drawFace") final void drawFace(int var1) { - if (field2544[var1]) { - this.method4459(var1); + if (field2548[var1]) { // L: 1106 + this.method4544(var1); // L: 1107 } else { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - Rasterizer3D.field2347 = field2543[var1]; - if (this.faceAlphas == null) { + int var2 = this.indices1[var1]; // L: 1110 + int var3 = this.indices2[var1]; // L: 1111 + int var4 = this.indices3[var1]; // L: 1112 + Rasterizer3D.field2365 = field2554[var1]; // L: 1113 + if (this.faceAlphas == null) { // L: 1114 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1115 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1116 int var5; int var6; int var7; - if (this.field2504 != null && this.field2504[var1] != -1) { - int var8 = this.field2504[var1] & 255; - var5 = this.field2525[var8]; - var6 = this.field2526[var8]; - var7 = this.field2527[var8]; + if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1124 + int var8 = this.field2566[var1] & 255; // L: 1125 + var5 = this.field2529[var8]; // L: 1126 + var6 = this.field2530[var8]; // L: 1127 + var7 = this.field2538[var8]; // L: 1128 } else { - var5 = var2; - var6 = var3; - var7 = var4; + var5 = var2; // L: 1131 + var6 = var3; // L: 1132 + var7 = var4; // L: 1133 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method4132(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2548[var5], field2548[var6], field2548[var7], field2549[var5], field2549[var6], field2549[var7], field2514[var5], field2514[var6], field2514[var7], this.faceTextures[var1]); + Rasterizer3D.method4215(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var5], field2574[var6], field2574[var7], field2547[var5], field2547[var6], field2547[var7], field2575[var5], field2575[var6], field2575[var7], this.faceTextures[var1]); // L: 1135 } else { - Rasterizer3D.method4132(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2548[var5], field2548[var6], field2548[var7], field2549[var5], field2549[var6], field2549[var7], field2514[var5], field2514[var6], field2514[var7], this.faceTextures[var1]); + Rasterizer3D.method4215(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2574[var5], field2574[var6], field2574[var7], field2547[var5], field2547[var6], field2547[var7], field2575[var5], field2575[var6], field2575[var7], this.faceTextures[var1]); // L: 1136 } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method4130(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2515[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1117 + Rasterizer3D.method4213(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2540[this.faceColors1[var1]]); } else { - Rasterizer3D.method4128(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method4211(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1118 } } - } + } // L: 1108 1138 - @ObfuscatedName("u") - final void method4459(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; - int var4 = 0; - int var5 = this.indices1[var1]; - int var6 = this.indices2[var1]; - int var7 = this.indices3[var1]; - int var8 = field2514[var5]; - int var9 = field2514[var6]; - int var10 = field2514[var7]; - if (this.faceAlphas == null) { + @ObfuscatedName("ae") + final void method4544(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1141 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1142 + int var4 = 0; // L: 1143 + int var5 = this.indices1[var1]; // L: 1144 + int var6 = this.indices2[var1]; // L: 1145 + int var7 = this.indices3[var1]; // L: 1146 + int var8 = field2575[var5]; // L: 1147 + int var9 = field2575[var6]; // L: 1148 + int var10 = field2575[var7]; // L: 1149 + if (this.faceAlphas == null) { // L: 1150 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1151 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { - field2559[var4] = modelViewportXs[var5]; - field2507[var4] = modelViewportYs[var5]; - field2561[var4++] = this.faceColors1[var1]; + if (var8 >= 50) { // L: 1152 + field2563[var4] = modelViewportXs[var5]; // L: 1153 + field2564[var4] = modelViewportYs[var5]; // L: 1154 + field2521[var4++] = this.faceColors1[var1]; // L: 1155 } else { - var11 = field2548[var5]; - var12 = field2549[var5]; - var13 = this.faceColors1[var1]; - if (var10 >= 50) { - var14 = field2508[var10 - var8] * (50 - var8); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var7] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var7] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var11 = field2574[var5]; // L: 1158 + var12 = field2547[var5]; // L: 1159 + var13 = this.faceColors1[var1]; // L: 1160 + if (var10 >= 50) { // L: 1161 + var14 = field2508[var10 - var8] * (50 - var8); // L: 1162 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var7] - var11) * var14 >> 16)) / 50; // L: 1163 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1164 + field2521[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1165 } - if (var9 >= 50) { - var14 = field2508[var9 - var8] * (50 - var8); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var6] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var6] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + if (var9 >= 50) { // L: 1167 + var14 = field2508[var9 - var8] * (50 - var8); // L: 1168 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var6] - var11) * var14 >> 16)) / 50; // L: 1169 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1170 + field2521[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1171 } } - if (var9 >= 50) { - field2559[var4] = modelViewportXs[var6]; - field2507[var4] = modelViewportYs[var6]; - field2561[var4++] = this.faceColors2[var1]; + if (var9 >= 50) { // L: 1174 + field2563[var4] = modelViewportXs[var6]; // L: 1175 + field2564[var4] = modelViewportYs[var6]; // L: 1176 + field2521[var4++] = this.faceColors2[var1]; // L: 1177 } else { - var11 = field2548[var6]; - var12 = field2549[var6]; - var13 = this.faceColors2[var1]; - if (var8 >= 50) { - var14 = field2508[var8 - var9] * (50 - var9); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var5] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var5] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var11 = field2574[var6]; // L: 1180 + var12 = field2547[var6]; // L: 1181 + var13 = this.faceColors2[var1]; // L: 1182 + if (var8 >= 50) { // L: 1183 + var14 = field2508[var8 - var9] * (50 - var9); // L: 1184 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var5] - var11) * var14 >> 16)) / 50; // L: 1185 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1186 + field2521[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1187 } - if (var10 >= 50) { - var14 = field2508[var10 - var9] * (50 - var9); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var7] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var7] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + if (var10 >= 50) { // L: 1189 + var14 = field2508[var10 - var9] * (50 - var9); // L: 1190 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var7] - var11) * var14 >> 16)) / 50; // L: 1191 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1192 + field2521[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1193 } } - if (var10 >= 50) { - field2559[var4] = modelViewportXs[var7]; - field2507[var4] = modelViewportYs[var7]; - field2561[var4++] = this.faceColors3[var1]; + if (var10 >= 50) { // L: 1196 + field2563[var4] = modelViewportXs[var7]; // L: 1197 + field2564[var4] = modelViewportYs[var7]; // L: 1198 + field2521[var4++] = this.faceColors3[var1]; // L: 1199 } else { - var11 = field2548[var7]; - var12 = field2549[var7]; - var13 = this.faceColors3[var1]; - if (var9 >= 50) { - var14 = field2508[var9 - var10] * (50 - var10); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var6] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var6] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var11 = field2574[var7]; // L: 1202 + var12 = field2547[var7]; // L: 1203 + var13 = this.faceColors3[var1]; // L: 1204 + if (var9 >= 50) { // L: 1205 + var14 = field2508[var9 - var10] * (50 - var10); // L: 1206 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var6] - var11) * var14 >> 16)) / 50; // L: 1207 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1208 + field2521[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1209 } - if (var8 >= 50) { - var14 = field2508[var8 - var10] * (50 - var10); - field2559[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2548[var5] - var11) * var14 >> 16)) / 50; - field2507[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2549[var5] - var12) * var14 >> 16)) / 50; - field2561[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + if (var8 >= 50) { // L: 1211 + var14 = field2508[var8 - var10] * (50 - var10); // L: 1212 + field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var5] - var11) * var14 >> 16)) / 50; // L: 1213 + field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1214 + field2521[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1215 } } - var11 = field2559[0]; - var12 = field2559[1]; - var13 = field2559[2]; - var14 = field2507[0]; - int var15 = field2507[1]; - int var16 = field2507[2]; - Rasterizer3D.field2347 = false; + var11 = field2563[0]; // L: 1218 + var12 = field2563[1]; // L: 1219 + var13 = field2563[2]; // L: 1220 + var14 = field2564[0]; // L: 1221 + int var15 = field2564[1]; // L: 1222 + int var16 = field2564[2]; // L: 1223 + Rasterizer3D.field2365 = false; // L: 1224 int var17; int var18; int var19; int var20; - if (var4 == 3) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2347 = true; + if (var4 == 3) { // L: 1225 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1226 + Rasterizer3D.field2365 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2504 != null && this.field2504[var1] != -1) { - var20 = this.field2504[var1] & 255; - var17 = this.field2525[var20]; - var18 = this.field2526[var20]; - var19 = this.field2527[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1227 + if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1235 + var20 = this.field2566[var1] & 255; // L: 1236 + var17 = this.field2529[var20]; // L: 1237 + var18 = this.field2530[var20]; // L: 1238 + var19 = this.field2538[var20]; // L: 1239 } else { - var17 = var5; - var18 = var6; - var19 = var7; + var17 = var5; // L: 1242 + var18 = var6; // L: 1243 + var19 = var7; // L: 1244 } - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method4132(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { // L: 1246 + Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method4132(var14, var15, var16, var11, var12, var13, field2561[0], field2561[1], field2561[2], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], this.faceTextures[var1]); + Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], this.faceTextures[var1]); // L: 1247 } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method4130(var14, var15, var16, var11, var12, var13, field2515[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1228 + Rasterizer3D.method4213(var14, var15, var16, var11, var12, var13, field2540[this.faceColors1[var1]]); } else { - Rasterizer3D.method4128(var14, var15, var16, var11, var12, var13, field2561[0], field2561[1], field2561[2]); + Rasterizer3D.method4211(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2]); // L: 1229 } } - if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2559[3] < 0 || field2559[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2347 = true; + if (var4 == 4) { // L: 1250 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2563[3] < 0 || field2563[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1251 + Rasterizer3D.field2365 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2504 != null && this.field2504[var1] != -1) { - var20 = this.field2504[var1] & 255; - var17 = this.field2525[var20]; - var18 = this.field2526[var20]; - var19 = this.field2527[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1252 + if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1267 + var20 = this.field2566[var1] & 255; // L: 1268 + var17 = this.field2529[var20]; // L: 1269 + var18 = this.field2530[var20]; // L: 1270 + var19 = this.field2538[var20]; // L: 1271 } else { - var17 = var5; - var18 = var6; - var19 = var7; + var17 = var5; // L: 1274 + var18 = var6; // L: 1275 + var19 = var7; // L: 1276 } - short var21 = this.faceTextures[var1]; - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method4132(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], var21); - Rasterizer3D.method4132(var14, var16, field2507[3], var11, var13, field2559[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], var21); + short var21 = this.faceTextures[var1]; // L: 1278 + if (this.faceColors3[var1] == -1) { // L: 1279 + Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1280 + Rasterizer3D.method4215(var14, var16, field2564[3], var11, var13, field2563[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1281 } else { - Rasterizer3D.method4132(var14, var15, var16, var11, var12, var13, field2561[0], field2561[1], field2561[2], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], var21); - Rasterizer3D.method4132(var14, var16, field2507[3], var11, var13, field2559[3], field2561[0], field2561[2], field2561[3], field2548[var17], field2548[var18], field2548[var19], field2549[var17], field2549[var18], field2549[var19], field2514[var17], field2514[var18], field2514[var19], var21); + Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1284 + Rasterizer3D.method4215(var14, var16, field2564[3], var11, var13, field2563[3], field2521[0], field2521[2], field2521[3], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1285 } - } else if (this.faceColors3[var1] == -1) { - var17 = field2515[this.faceColors1[var1]]; - Rasterizer3D.method4130(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method4130(var14, var16, field2507[3], var11, var13, field2559[3], var17); + } else if (this.faceColors3[var1] == -1) { // L: 1253 + var17 = field2540[this.faceColors1[var1]]; // L: 1254 + Rasterizer3D.method4213(var14, var15, var16, var11, var12, var13, var17); // L: 1255 + Rasterizer3D.method4213(var14, var16, field2564[3], var11, var13, field2563[3], var17); // L: 1256 } else { - Rasterizer3D.method4128(var14, var15, var16, var11, var12, var13, field2561[0], field2561[1], field2561[2]); - Rasterizer3D.method4128(var14, var16, field2507[3], var11, var13, field2559[3], field2561[0], field2561[2], field2561[3]); + Rasterizer3D.method4211(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2]); // L: 1259 + Rasterizer3D.method4211(var14, var16, field2564[3], var11, var13, field2563[3], field2521[0], field2521[2], field2521[3]); // L: 1260 } } - } + } // L: 1289 - @ObfuscatedName("cr") + @ObfuscatedName("cl") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2539[0] = -1; - if (this.boundsType != 1) { + field2556[0] = -1; // L: 723 + if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } - 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 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; - if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var21 = (var3 * super.height >> 16) + var19; - int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; - if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var23 = var13 + (var2 * super.height >> 16); - boolean var24 = false; - boolean var25 = false; - if (var12 - var23 <= 50) { + this.calculateBoundingBox(var1); // L: 725 + int var11 = var5 * var8 - var4 * var6 >> 16; // L: 726 + int var12 = var2 * var7 + var3 * var11 >> 16; // L: 727 + int var13 = var3 * this.xzRadius >> 16; // L: 728 + int var14 = var12 + var13; // L: 729 + if (var14 > 50 && var12 < 3500) { // L: 730 + int var15 = var8 * var4 + var5 * var6 >> 16; // L: 731 + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 732 + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 733 + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 734 + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 735 + int var18 = var3 * var7 - var11 * var2 >> 16; // L: 736 + int var19 = var2 * this.xzRadius >> 16; // L: 737 + int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; // L: 738 + if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 739 + int var21 = (var3 * super.height >> 16) + var19; // L: 740 + int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; // L: 741 + if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 742 + int var23 = var13 + (var2 * super.height >> 16); // L: 743 + boolean var24 = false; // L: 744 + boolean var25 = false; // L: 745 + if (var12 - var23 <= 50) { // L: 746 var25 = true; } - boolean var26 = var25 || this.field2570 > 0; - int var27 = NPC.method2232(); - int var28 = StructComposition.method3151(); - boolean var29 = GameEngine.method510(); - boolean var30 = class7.method60(var9); - boolean var31 = false; - int var33; - int var34; - int var35; - if (var30 && var29) { - boolean var32 = false; - if (field2538) { - var32 = class14.method179(this, var6, var7, var8); + boolean var26 = var25 || this.field2522 > 0; // L: 747 + int var27 = ViewportMouse.ViewportMouse_x; // L: 750 + int var29 = ParamComposition.method3229(); // L: 753 + boolean var30 = class176.method3531(); // L: 754 + boolean var31 = ItemLayer.method4106(var9); // L: 755 + boolean var32 = false; // L: 756 + int var36; + int var37; + int var38; + int var39; + int var47; + int var53; + int var54; + int var55; + if (var31 && var30) { // L: 757 + boolean var33 = false; // L: 758 + if (field2576) { // L: 759 + boolean var34; + if (!class176.method3531()) { // L: 763 + var34 = false; // L: 764 + } else { + int var42; + int var43; + int var44; + if (!ViewportMouse.ViewportMouse_false0) { // L: 768 + var36 = Scene.Scene_cameraPitchSine; // L: 769 + var37 = Scene.Scene_cameraPitchCosine; // L: 770 + var38 = Scene.Scene_cameraYawSine; // L: 771 + var39 = Scene.Scene_cameraYawCosine; // L: 772 + byte var40 = 50; // L: 773 + short var41 = 3500; // L: 774 + var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 775 + var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 776 + var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 777 + int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 778 + int var46 = Rasterizer3D.method4224(var43, var40, var37, var36); // L: 780 + var54 = Rasterizer3D.method4225(var43, var40, var37, var36); // L: 781 + var43 = var46; // L: 782 + var46 = Rasterizer3D.method4224(var45, var41, var37, var36); // L: 783 + var55 = Rasterizer3D.method4225(var45, var41, var37, var36); // L: 784 + var45 = var46; // L: 785 + var46 = Rasterizer3D.method4222(var42, var54, var39, var38); // L: 786 + var54 = Rasterizer3D.method4223(var42, var54, var39, var38); // L: 787 + var42 = var46; // L: 788 + var46 = Rasterizer3D.method4222(var44, var55, var39, var38); // L: 789 + var55 = Rasterizer3D.method4223(var44, var55, var39, var38); // L: 790 + ViewportMouse.field2582 = (var46 + var42) / 2; // L: 792 + ViewportMouse.field2579 = (var45 + var43) / 2; // L: 793 + class157.field1675 = (var54 + var55) / 2; // L: 794 + ViewportMouse.field2584 = (var46 - var42) / 2; // L: 795 + class361.field4050 = (var45 - var43) / 2; // L: 796 + ViewportMouse.field2590 = (var55 - var54) / 2; // L: 797 + FriendLoginUpdate.field3943 = Math.abs(ViewportMouse.field2584); // L: 798 + class120.field1403 = Math.abs(class361.field4050); // L: 799 + class131.field1485 = Math.abs(ViewportMouse.field2590); // L: 800 + } + + var36 = this.xMid + var6; // L: 802 + var37 = var7 + this.yMid; // L: 803 + var38 = var8 + this.zMid; // L: 804 + var39 = this.xMidOffset; // L: 805 + var54 = this.yMidOffset; // L: 806 + var55 = this.zMidOffset; // L: 807 + var42 = ViewportMouse.field2582 - var36; // L: 808 + var43 = ViewportMouse.field2579 - var37; // L: 809 + var44 = class157.field1675 - var38; // L: 810 + if (Math.abs(var42) > var39 + FriendLoginUpdate.field3943) { // L: 811 + var34 = false; // L: 812 + } else if (Math.abs(var43) > var54 + class120.field1403) { // L: 815 + var34 = false; // L: 816 + } else if (Math.abs(var44) > var55 + class131.field1485) { // L: 819 + var34 = false; // L: 820 + } else if (Math.abs(var44 * class361.field4050 - var43 * ViewportMouse.field2590) > var55 * class120.field1403 + var54 * class131.field1485) { // L: 823 + var34 = false; // L: 824 + } else if (Math.abs(var42 * ViewportMouse.field2590 - var44 * ViewportMouse.field2584) > var55 * FriendLoginUpdate.field3943 + var39 * class131.field1485) { // L: 827 + var34 = false; // L: 828 + } else if (Math.abs(var43 * ViewportMouse.field2584 - var42 * class361.field4050) > var39 * class120.field1403 + var54 * FriendLoginUpdate.field3943) { // L: 831 + var34 = false; // L: 832 + } else { + var34 = true; // L: 835 + } + } + + var33 = var34; // L: 837 } else { - var33 = var12 - var13; - if (var33 <= 50) { - var33 = 50; + var53 = var12 - var13; // L: 840 + if (var53 <= 50) { // L: 841 + var53 = 50; } - if (var15 > 0) { - var16 /= var14; - var17 /= var33; + if (var15 > 0) { // L: 842 + var16 /= var14; // L: 843 + var17 /= var53; // L: 844 } else { - var17 /= var14; - var16 /= var33; + var17 /= var14; // L: 847 + var16 /= var53; // L: 848 } - if (var18 > 0) { - var22 /= var14; - var20 /= var33; + if (var18 > 0) { // L: 850 + var22 /= var14; // L: 851 + var20 /= var53; // L: 852 } else { - var20 /= var14; - var22 /= var33; + var20 /= var14; // L: 855 + var22 /= var53; // L: 856 } - var34 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var35 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var34 > var16 && var34 < var17 && var35 > var22 && var35 < var20) { - var32 = true; + var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 858 + var36 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 859 + if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { // L: 860 + var33 = true; // L: 861 } } - if (var32) { - if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + if (var33) { // L: 864 + if (this.isSingleTile) { // L: 865 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 868 } else { - var31 = true; + var32 = true; // L: 871 } } } - int var45 = Rasterizer3D.Rasterizer3D_clipMidX; - var33 = Rasterizer3D.Rasterizer3D_clipMidY; - var34 = 0; - var35 = 0; - if (var1 != 0) { - var34 = Model_sine[var1]; - var35 = Model_cosine[var1]; + int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 874 + var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 875 + var47 = 0; // L: 876 + var36 = 0; // L: 877 + if (var1 != 0) { // L: 878 + var47 = Model_sine[var1]; // L: 879 + var36 = Model_cosine[var1]; // L: 880 } - for (int var36 = 0; var36 < this.verticesCount; ++var36) { - int var37 = this.verticesX[var36]; - int var38 = this.verticesY[var36]; - int var39 = this.verticesZ[var36]; - int var40; - if (var1 != 0) { - var40 = var39 * var34 + var37 * var35 >> 16; - var39 = var39 * var35 - var37 * var34 >> 16; - var37 = var40; + for (var37 = 0; var37 < this.verticesCount; ++var37) { // L: 882 + var38 = this.verticesX[var37]; // L: 883 + var39 = this.verticesY[var37]; // L: 884 + var54 = this.verticesZ[var37]; // L: 885 + if (var1 != 0) { // L: 886 + var55 = var54 * var47 + var38 * var36 >> 16; // L: 887 + var54 = var54 * var36 - var38 * var47 >> 16; // L: 888 + var38 = var55; // L: 889 } - var37 += var6; - var38 += var7; - var39 += var8; - var40 = var39 * var4 + var5 * var37 >> 16; - var39 = var5 * var39 - var37 * var4 >> 16; - var37 = var40; - var40 = var3 * var38 - var39 * var2 >> 16; - var39 = var38 * var2 + var3 * var39 >> 16; - field2547[var36] = var39 - var12; - if (var39 >= 50) { - modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var45; - modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var33; + var38 += var6; // L: 891 + var39 += var7; // L: 892 + var54 += var8; // L: 893 + var55 = var54 * var4 + var5 * var38 >> 16; // L: 894 + var54 = var5 * var54 - var38 * var4 >> 16; // L: 895 + var38 = var55; // L: 896 + var55 = var3 * var39 - var54 * var2 >> 16; // L: 897 + var54 = var39 * var2 + var3 * var54 >> 16; // L: 898 + field2551[var37] = var54 - var12; // L: 900 + if (var54 >= 50) { // L: 901 + modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 902 + modelViewportYs[var37] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 903 } else { - modelViewportXs[var36] = -5000; - var24 = true; + modelViewportXs[var37] = -5000; // L: 906 + var24 = true; // L: 907 } - if (var26) { - field2548[var36] = var37; - field2549[var36] = var40; - field2514[var36] = var39; + if (var26) { // L: 909 + field2574[var37] = var38; // L: 910 + field2547[var37] = var55; // L: 911 + field2575[var37] = var54; // L: 912 } } try { - this.draw0(var24, var31, this.isSingleTile, var9); - } catch (Exception var44) { + this.draw0(var24, var32, this.isSingleTile, var9); // L: 916 + } catch (Exception var51) { // L: 918 } } @@ -1729,5 +1799,5 @@ public class Model extends Renderable { } } } - } + } // L: 919 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index af02823d3f..d634ba76cb 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,137 +3,137 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gk") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("aa") - static int[] field2253; - @ObfuscatedName("ag") - static int[] field2254; - @ObfuscatedName("aq") - static int field2280; - @ObfuscatedName("ar") + @ObfuscatedName("az") + static int[] field2255; + @ObfuscatedName("ac") + static int[] field2283; + @ObfuscatedName("ak") + static int field2269; + @ObfuscatedName("ab") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ac") + @ObfuscatedName("ar") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("verticesCount") int verticesCount; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("verticesX") int[] verticesX; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("verticesY") int[] verticesY; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("faceCount") int faceCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("indices1") int[] indices1; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("indices2") int[] indices2; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("indices3") int[] indices3; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("faceColors") short[] faceColors; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("priority") byte priority; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Lhx;" + descriptor = "[Lhq;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lha;" + descriptor = "[Lhp;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Lha;" + descriptor = "[Lhp;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("ambient") public short ambient; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("contrast") public short contrast; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ah") - int field2273; - @ObfuscatedName("ay") - int field2274; - @ObfuscatedName("al") - int field2275; - @ObfuscatedName("ao") - int field2244; - @ObfuscatedName("au") + @ObfuscatedName("am") int field2277; + @ObfuscatedName("ai") + int field2278; + @ObfuscatedName("ah") + int field2275; + @ObfuscatedName("as") + int field2280; + @ObfuscatedName("at") + int field2267; static { - field2253 = new int[10000]; - field2254 = new int[10000]; - field2280 = 0; - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; + field2255 = new int[10000]; // L: 44 + field2283 = new int[10000]; // L: 45 + field2269 = 0; // L: 46 + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } ModelData() { @@ -141,949 +141,949 @@ public class ModelData extends Renderable { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - } + } // L: 50 @ObfuscatedSignature( - descriptor = "([Lgi;I)V" + descriptor = "([Lgk;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - boolean var3 = false; - boolean var4 = false; - boolean var5 = false; - boolean var6 = false; - boolean var7 = false; - boolean var8 = false; - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; - this.priority = -1; + boolean var3 = false; // L: 471 + boolean var4 = false; // L: 472 + boolean var5 = false; // L: 473 + boolean var6 = false; // L: 474 + boolean var7 = false; // L: 475 + boolean var8 = false; // L: 476 + this.verticesCount = 0; // L: 477 + this.faceCount = 0; // L: 478 + this.textureTriangleCount = 0; // L: 479 + this.priority = -1; // L: 480 int var9; ModelData var10; - for (var9 = 0; var9 < var2; ++var9) { - var10 = var1[var9]; - if (var10 != null) { - this.verticesCount += var10.verticesCount; - this.faceCount += var10.faceCount; - this.textureTriangleCount += var10.textureTriangleCount; - if (var10.faceRenderPriorities != null) { + for (var9 = 0; var9 < var2; ++var9) { // L: 481 + var10 = var1[var9]; // L: 482 + if (var10 != null) { // L: 483 + this.verticesCount += var10.verticesCount; // L: 484 + this.faceCount += var10.faceCount; // L: 485 + this.textureTriangleCount += var10.textureTriangleCount; // L: 486 + if (var10.faceRenderPriorities != null) { // L: 487 var4 = true; } else { - if (this.priority == -1) { + if (this.priority == -1) { // L: 489 this.priority = var10.priority; } - if (this.priority != var10.priority) { + if (this.priority != var10.priority) { // L: 490 var4 = true; } } - var3 |= var10.faceRenderTypes != null; - var5 |= var10.faceAlphas != null; - var6 |= var10.faceSkins != null; - var7 |= var10.faceTextures != null; - var8 |= var10.textureCoords != null; + var3 |= var10.faceRenderTypes != null; // L: 492 + var5 |= var10.faceAlphas != null; // L: 493 + var6 |= var10.faceSkins != null; // L: 494 + var7 |= var10.faceTextures != null; // L: 495 + var8 |= var10.textureCoords != null; // L: 496 } } - 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.verticesX = new int[this.verticesCount]; // L: 499 + this.verticesY = new int[this.verticesCount]; // L: 500 + this.verticesZ = new int[this.verticesCount]; // L: 501 + this.vertexSkins = new int[this.verticesCount]; // L: 502 + this.indices1 = new int[this.faceCount]; // L: 503 + this.indices2 = new int[this.faceCount]; // L: 504 + this.indices3 = new int[this.faceCount]; // L: 505 + if (var3) { // L: 506 this.faceRenderTypes = new byte[this.faceCount]; } - if (var4) { + if (var4) { // L: 507 this.faceRenderPriorities = new byte[this.faceCount]; } - if (var5) { + if (var5) { // L: 508 this.faceAlphas = new byte[this.faceCount]; } - if (var6) { + if (var6) { // L: 509 this.faceSkins = new int[this.faceCount]; } - if (var7) { + if (var7) { // L: 510 this.faceTextures = new short[this.faceCount]; } - if (var8) { + if (var8) { // L: 511 this.textureCoords = new byte[this.faceCount]; } - 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.faceColors = new short[this.faceCount]; // L: 512 + if (this.textureTriangleCount > 0) { // L: 513 + this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 514 + this.texTriangleX = new short[this.textureTriangleCount]; // L: 515 + this.texTriangleY = new short[this.textureTriangleCount]; // L: 516 + this.texTriangleZ = new short[this.textureTriangleCount]; // L: 517 } - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; + this.verticesCount = 0; // L: 519 + this.faceCount = 0; // L: 520 + this.textureTriangleCount = 0; // L: 521 - for (var9 = 0; var9 < var2; ++var9) { - var10 = var1[var9]; - if (var10 != null) { + for (var9 = 0; var9 < var2; ++var9) { // L: 522 + var10 = var1[var9]; // L: 523 + if (var10 != null) { // L: 524 int var11; - for (var11 = 0; var11 < var10.faceCount; ++var11) { - if (var3 && var10.faceRenderTypes != null) { + for (var11 = 0; var11 < var10.faceCount; ++var11) { // L: 525 + if (var3 && var10.faceRenderTypes != null) { // L: 526 527 this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11]; } - if (var4) { - if (var10.faceRenderPriorities != null) { + if (var4) { // L: 529 + if (var10.faceRenderPriorities != null) { // L: 530 this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; } else { - this.faceRenderPriorities[this.faceCount] = var10.priority; + this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 } } - if (var5 && var10.faceAlphas != null) { + if (var5 && var10.faceAlphas != null) { // L: 533 534 this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; } - if (var6 && var10.faceSkins != null) { + if (var6 && var10.faceSkins != null) { // L: 536 537 this.faceSkins[this.faceCount] = var10.faceSkins[var11]; } - if (var7) { - if (var10.faceTextures != null) { + if (var7) { // L: 539 + if (var10.faceTextures != null) { // L: 540 this.faceTextures[this.faceCount] = var10.faceTextures[var11]; } else { - this.faceTextures[this.faceCount] = -1; + this.faceTextures[this.faceCount] = -1; // L: 541 } } - if (var8) { - if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { + if (var8) { // L: 543 + if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { // L: 544 this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]); } else { - this.textureCoords[this.faceCount] = -1; + this.textureCoords[this.faceCount] = -1; // L: 545 } } - this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method4027(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method4027(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method4027(var10, var10.indices3[var11]); - ++this.faceCount; + this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 + this.indices1[this.faceCount] = this.method4123(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method4123(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method4123(var10, var10.indices3[var11]); // L: 550 + ++this.faceCount; // L: 551 } - for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { - byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; - if (var12 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method4027(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method4027(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method4027(var10, var10.texTriangleZ[var11]); + for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 + byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 + if (var12 == 0) { // L: 555 + this.texTriangleX[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleZ[var11]); // L: 558 } - ++this.textureTriangleCount; + ++this.textureTriangleCount; // L: 560 } } } - } + } // L: 564 ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method4024(var1); + if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 + this.method4112(var1); } else { - this.method4025(var1); + this.method4113(var1); // L: 60 } - } + } // L: 61 @ObfuscatedSignature( - descriptor = "(Lgi;ZZZZ)V", + descriptor = "(Lgk;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { - this.verticesCount = 0; - this.faceCount = 0; - this.priority = 0; - this.isBoundsCalculated = false; - this.verticesCount = var1.verticesCount; - this.faceCount = var1.faceCount; - this.textureTriangleCount = var1.textureTriangleCount; + this.verticesCount = 0; // L: 9 + this.faceCount = 0; // L: 13 + this.priority = 0; // L: 23 + this.isBoundsCalculated = false; // L: 38 + this.verticesCount = var1.verticesCount; // L: 588 + this.faceCount = var1.faceCount; // L: 589 + this.textureTriangleCount = var1.textureTriangleCount; // L: 590 int var6; - if (var2) { - this.verticesX = var1.verticesX; - this.verticesY = var1.verticesY; - this.verticesZ = var1.verticesZ; + if (var2) { // L: 591 + this.verticesX = var1.verticesX; // L: 592 + this.verticesY = var1.verticesY; // L: 593 + this.verticesZ = var1.verticesZ; // L: 594 } else { - this.verticesX = new int[this.verticesCount]; - this.verticesY = new int[this.verticesCount]; - this.verticesZ = new int[this.verticesCount]; + this.verticesX = new int[this.verticesCount]; // L: 597 + this.verticesY = new int[this.verticesCount]; // L: 598 + this.verticesZ = new int[this.verticesCount]; // L: 599 - 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]; + for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 600 + this.verticesX[var6] = var1.verticesX[var6]; // L: 601 + this.verticesY[var6] = var1.verticesY[var6]; // L: 602 + this.verticesZ[var6] = var1.verticesZ[var6]; // L: 603 } } - if (var3) { + if (var3) { // L: 606 this.faceColors = var1.faceColors; } else { - this.faceColors = new short[this.faceCount]; + this.faceColors = new short[this.faceCount]; // L: 608 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 609 this.faceColors[var6] = var1.faceColors[var6]; } } - if (!var4 && var1.faceTextures != null) { - this.faceTextures = new short[this.faceCount]; + if (!var4 && var1.faceTextures != null) { // L: 611 + this.faceTextures = new short[this.faceCount]; // L: 613 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 614 this.faceTextures[var6] = var1.faceTextures[var6]; } } else { this.faceTextures = var1.faceTextures; } - 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.ambient = var1.ambient; - this.contrast = var1.contrast; + this.faceAlphas = var1.faceAlphas; // L: 616 + this.indices1 = var1.indices1; // L: 626 + this.indices2 = var1.indices2; // L: 627 + this.indices3 = var1.indices3; // L: 628 + this.faceRenderTypes = var1.faceRenderTypes; // L: 629 + this.faceRenderPriorities = var1.faceRenderPriorities; // L: 630 + this.textureCoords = var1.textureCoords; // L: 631 + this.priority = var1.priority; // L: 632 + this.textureRenderTypes = var1.textureRenderTypes; // L: 633 + this.texTriangleX = var1.texTriangleX; // L: 634 + this.texTriangleY = var1.texTriangleY; // L: 635 + this.texTriangleZ = var1.texTriangleZ; // L: 636 + this.vertexSkins = var1.vertexSkins; // L: 637 + this.faceSkins = var1.faceSkins; // L: 638 + this.vertexLabels = var1.vertexLabels; // L: 639 + this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 + this.vertexNormals = var1.vertexNormals; // L: 641 + this.faceNormals = var1.faceNormals; // L: 642 + this.vertexVertices = var1.vertexVertices; // L: 643 + this.ambient = var1.ambient; // L: 644 + this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("f") - void method4024(byte[] var1) { - 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; + @ObfuscatedName("s") + void method4112(byte[] var1) { + Buffer var2 = new Buffer(var1); // L: 64 + Buffer var3 = new Buffer(var1); // L: 65 + Buffer var4 = new Buffer(var1); // L: 66 + Buffer var5 = new Buffer(var1); // L: 67 + Buffer var6 = new Buffer(var1); // L: 68 + Buffer var7 = new Buffer(var1); // L: 69 + Buffer var8 = new Buffer(var1); // L: 70 + var2.offset = var1.length - 23; // L: 71 + int var9 = var2.readUnsignedShort(); // L: 72 + int var10 = var2.readUnsignedShort(); // L: 73 + int var11 = var2.readUnsignedByte(); // L: 74 + int var12 = var2.readUnsignedByte(); // L: 75 + int var13 = var2.readUnsignedByte(); // L: 76 + int var14 = var2.readUnsignedByte(); // L: 77 + int var15 = var2.readUnsignedByte(); // L: 78 + int var16 = var2.readUnsignedByte(); // L: 79 + int var17 = var2.readUnsignedByte(); // L: 80 + int var18 = var2.readUnsignedShort(); // L: 81 + int var19 = var2.readUnsignedShort(); // L: 82 + int var20 = var2.readUnsignedShort(); // L: 83 + int var21 = var2.readUnsignedShort(); // L: 84 + int var22 = var2.readUnsignedShort(); // L: 85 + int var23 = 0; // L: 86 + int var24 = 0; // L: 87 + int var25 = 0; // L: 88 int var26; - if (var11 > 0) { - this.textureRenderTypes = new byte[var11]; - var2.offset = 0; + if (var11 > 0) { // L: 89 + this.textureRenderTypes = new byte[var11]; // L: 90 + var2.offset = 0; // L: 91 - for (var26 = 0; var26 < var11; ++var26) { - byte var27 = this.textureRenderTypes[var26] = var2.readByte(); - if (var27 == 0) { + for (var26 = 0; var26 < var11; ++var26) { // L: 92 + byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 93 + if (var27 == 0) { // L: 94 ++var23; } - if (var27 >= 1 && var27 <= 3) { + if (var27 >= 1 && var27 <= 3) { // L: 95 ++var24; } - if (var27 == 2) { + if (var27 == 2) { // L: 96 ++var25; } } } - var26 = var11 + var9; - int var28 = var26; - if (var12 == 1) { + var26 = var11 + var9; // L: 101 + int var28 = var26; // L: 102 + if (var12 == 1) { // L: 103 var26 += var10; } - int var29 = var26; - var26 += var10; - int var30 = var26; - if (var13 == 255) { + int var29 = var26; // L: 104 + var26 += var10; // L: 105 + int var30 = var26; // L: 106 + if (var13 == 255) { // L: 107 var26 += var10; } - int var31 = var26; - if (var15 == 1) { + int var31 = var26; // L: 108 + if (var15 == 1) { // L: 109 var26 += var10; } - int var32 = var26; - if (var17 == 1) { + int var32 = var26; // L: 110 + if (var17 == 1) { // L: 111 var26 += var9; } - int var33 = var26; - if (var14 == 1) { + int var33 = var26; // L: 112 + if (var14 == 1) { // L: 113 var26 += var10; } - int var34 = var26; - var26 += var21; - int var35 = var26; - if (var16 == 1) { + int var34 = var26; // L: 114 + var26 += var21; // L: 115 + int var35 = var26; // L: 116 + if (var16 == 1) { // L: 117 var26 += var10 * 2; } - 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) { + int var36 = var26; // L: 118 + var26 += var22; // L: 119 + int var37 = var26; // L: 120 + var26 += var10 * 2; // L: 121 + int var38 = var26; // L: 122 + var26 += var18; // L: 123 + int var39 = var26; // L: 124 + var26 += var19; // L: 125 + int var40 = var26; // L: 126 + var26 += var20; // L: 127 + int var41 = var26; // L: 128 + var26 += var23 * 6; // L: 129 + int var42 = var26; // L: 130 + var26 += var24 * 6; // L: 131 + int var43 = var26; // L: 132 + var26 += var24 * 6; // L: 133 + int var44 = var26; // L: 134 + var26 += var24 * 2; // L: 135 + int var45 = var26; // L: 136 + var26 += var24; // L: 137 + int var46 = var26; // L: 138 + var26 += var24 * 2 + var25 * 2; // L: 139 + this.verticesCount = var9; // L: 141 + this.faceCount = var10; // L: 142 + this.textureTriangleCount = var11; // L: 143 + this.verticesX = new int[var9]; // L: 144 + this.verticesY = new int[var9]; // L: 145 + this.verticesZ = new int[var9]; // L: 146 + this.indices1 = new int[var10]; // L: 147 + this.indices2 = new int[var10]; // L: 148 + this.indices3 = new int[var10]; // L: 149 + if (var17 == 1) { // L: 150 this.vertexSkins = new int[var9]; } - if (var12 == 1) { + if (var12 == 1) { // L: 151 this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { + if (var13 == 255) { // L: 152 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 153 } - if (var14 == 1) { + if (var14 == 1) { // L: 154 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 155 this.faceSkins = new int[var10]; } - if (var16 == 1) { + if (var16 == 1) { // L: 156 this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { + if (var16 == 1 && var11 > 0) { // L: 157 this.textureCoords = new byte[var10]; } - this.faceColors = new short[var10]; - if (var11 > 0) { - this.texTriangleX = new short[var11]; - this.texTriangleY = new short[var11]; - this.texTriangleZ = new short[var11]; + this.faceColors = new short[var10]; // L: 158 + if (var11 > 0) { // L: 159 + this.texTriangleX = new short[var11]; // L: 160 + this.texTriangleY = new short[var11]; // L: 161 + this.texTriangleZ = new short[var11]; // L: 162 } - var2.offset = var11; - var3.offset = var38; - var4.offset = var39; - var5.offset = var40; - var6.offset = var32; - int var48 = 0; - int var49 = 0; - int var50 = 0; + var2.offset = var11; // L: 164 + var3.offset = var38; // L: 165 + var4.offset = var39; // L: 166 + var5.offset = var40; // L: 167 + var6.offset = var32; // L: 168 + int var48 = 0; // L: 169 + int var49 = 0; // L: 170 + int var50 = 0; // L: 171 int var51; int var52; int var53; int var54; int var55; - for (var51 = 0; var51 < var9; ++var51) { - var52 = var2.readUnsignedByte(); - var53 = 0; - if ((var52 & 1) != 0) { + for (var51 = 0; var51 < var9; ++var51) { // L: 172 + var52 = var2.readUnsignedByte(); // L: 173 + var53 = 0; // L: 174 + if ((var52 & 1) != 0) { // L: 175 var53 = var3.readShortSmart(); } - var54 = 0; - if ((var52 & 2) != 0) { + var54 = 0; // L: 176 + if ((var52 & 2) != 0) { // L: 177 var54 = var4.readShortSmart(); } - var55 = 0; - if ((var52 & 4) != 0) { + var55 = 0; // L: 178 + if ((var52 & 4) != 0) { // L: 179 var55 = var5.readShortSmart(); } - 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.verticesX[var51] = var48 + var53; // L: 180 + this.verticesY[var51] = var49 + var54; // L: 181 + this.verticesZ[var51] = var50 + var55; // L: 182 + var48 = this.verticesX[var51]; // L: 183 + var49 = this.verticesY[var51]; // L: 184 + var50 = this.verticesZ[var51]; // L: 185 + if (var17 == 1) { // L: 186 this.vertexSkins[var51] = var6.readUnsignedByte(); } } - var2.offset = var37; - var3.offset = var28; - var4.offset = var30; - var5.offset = var33; - var6.offset = var31; - var7.offset = var35; - var8.offset = var36; + var2.offset = var37; // L: 188 + var3.offset = var28; // L: 189 + var4.offset = var30; // L: 190 + var5.offset = var33; // L: 191 + var6.offset = var31; // L: 192 + var7.offset = var35; // L: 193 + var8.offset = var36; // L: 194 - for (var51 = 0; var51 < var10; ++var51) { - this.faceColors[var51] = (short)var2.readUnsignedShort(); - if (var12 == 1) { + for (var51 = 0; var51 < var10; ++var51) { // L: 195 + this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 196 + if (var12 == 1) { // L: 197 this.faceRenderTypes[var51] = var3.readByte(); } - if (var13 == 255) { + if (var13 == 255) { // L: 198 this.faceRenderPriorities[var51] = var4.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 199 this.faceAlphas[var51] = var5.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 200 this.faceSkins[var51] = var6.readUnsignedByte(); } - if (var16 == 1) { + if (var16 == 1) { // L: 201 this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var51] != -1) { + if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 202 this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var34; - var3.offset = var29; - var51 = 0; - var52 = 0; - var53 = 0; - var54 = 0; + var2.offset = var34; // L: 204 + var3.offset = var29; // L: 205 + var51 = 0; // L: 206 + var52 = 0; // L: 207 + var53 = 0; // L: 208 + var54 = 0; // L: 209 int var56; - 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; + for (var55 = 0; var55 < var10; ++var55) { // L: 210 + var56 = var3.readUnsignedByte(); // L: 211 + if (var56 == 1) { // L: 212 + var51 = var2.readShortSmart() + var54; // L: 213 + var52 = var2.readShortSmart() + var51; // L: 215 + var53 = var2.readShortSmart() + var52; // L: 217 + var54 = var53; // L: 218 + this.indices1[var55] = var51; // L: 219 + this.indices2[var55] = var52; // L: 220 + this.indices3[var55] = var53; // L: 221 } - 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 == 2) { // L: 223 + var52 = var53; // L: 224 + var53 = var2.readShortSmart() + var54; // L: 225 + var54 = var53; // L: 226 + this.indices1[var55] = var51; // L: 227 + this.indices2[var55] = var52; // L: 228 + this.indices3[var55] = var53; // L: 229 } - 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 == 3) { // L: 231 + var51 = var53; // L: 232 + var53 = var2.readShortSmart() + var54; // L: 233 + var54 = var53; // L: 234 + this.indices1[var55] = var51; // L: 235 + this.indices2[var55] = var52; // L: 236 + this.indices3[var55] = var53; // L: 237 } - 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; + if (var56 == 4) { // L: 239 + int var57 = var51; // L: 240 + var51 = var52; // L: 241 + var52 = var57; // L: 242 + var53 = var2.readShortSmart() + var54; // L: 243 + var54 = var53; // L: 244 + this.indices1[var55] = var51; // L: 245 + this.indices2[var55] = var57; // L: 246 + this.indices3[var55] = var53; // L: 247 } } - var2.offset = var41; - var3.offset = var42; - var4.offset = var43; - var5.offset = var44; - var6.offset = var45; - var7.offset = var46; + var2.offset = var41; // L: 250 + var3.offset = var42; // L: 251 + var4.offset = var43; // L: 252 + var5.offset = var44; // L: 253 + var6.offset = var45; // L: 254 + var7.offset = var46; // L: 255 - 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(); + for (var55 = 0; var55 < var11; ++var55) { // L: 256 + var56 = this.textureRenderTypes[var55] & 255; // L: 257 + if (var56 == 0) { // L: 258 + this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 259 + this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 260 + this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 261 } } - var2.offset = var26; - var55 = var2.readUnsignedByte(); - if (var55 != 0) { + var2.offset = var26; // L: 264 + var55 = var2.readUnsignedByte(); // L: 265 + if (var55 != 0) { // L: 266 new ModelData0(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readInt(); + var2.readUnsignedShort(); // L: 268 + var2.readUnsignedShort(); // L: 269 + var2.readUnsignedShort(); // L: 270 + var2.readInt(); // L: 271 } - } + } // L: 273 - @ObfuscatedName("j") - void method4025(byte[] var1) { - 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) { + @ObfuscatedName("a") + void method4113(byte[] var1) { + boolean var2 = false; // L: 276 + boolean var3 = false; // L: 277 + Buffer var4 = new Buffer(var1); // L: 278 + Buffer var5 = new Buffer(var1); // L: 279 + Buffer var6 = new Buffer(var1); // L: 280 + Buffer var7 = new Buffer(var1); // L: 281 + Buffer var8 = new Buffer(var1); // L: 282 + var4.offset = var1.length - 18; // L: 283 + int var9 = var4.readUnsignedShort(); // L: 284 + int var10 = var4.readUnsignedShort(); // L: 285 + int var11 = var4.readUnsignedByte(); // L: 286 + int var12 = var4.readUnsignedByte(); // L: 287 + int var13 = var4.readUnsignedByte(); // L: 288 + int var14 = var4.readUnsignedByte(); // L: 289 + int var15 = var4.readUnsignedByte(); // L: 290 + int var16 = var4.readUnsignedByte(); // L: 291 + int var17 = var4.readUnsignedShort(); // L: 292 + int var18 = var4.readUnsignedShort(); // L: 293 + int var19 = var4.readUnsignedShort(); // L: 294 + int var20 = var4.readUnsignedShort(); // L: 295 + byte var21 = 0; // L: 296 + int var45 = var21 + var9; // L: 298 + int var23 = var45; // L: 299 + var45 += var10; // L: 300 + int var24 = var45; // L: 301 + if (var13 == 255) { // L: 302 var45 += var10; } - int var25 = var45; - if (var15 == 1) { + int var25 = var45; // L: 303 + if (var15 == 1) { // L: 304 var45 += var10; } - int var26 = var45; - if (var12 == 1) { + int var26 = var45; // L: 305 + if (var12 == 1) { // L: 306 var45 += var10; } - int var27 = var45; - if (var16 == 1) { + int var27 = var45; // L: 307 + if (var16 == 1) { // L: 308 var45 += var9; } - int var28 = var45; - if (var14 == 1) { + int var28 = var45; // L: 309 + if (var14 == 1) { // L: 310 var45 += var10; } - 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]; + int var29 = var45; // L: 311 + var45 += var20; // L: 312 + int var30 = var45; // L: 313 + var45 += var10 * 2; // L: 314 + int var31 = var45; // L: 315 + var45 += var11 * 6; // L: 316 + int var32 = var45; // L: 317 + var45 += var17; // L: 318 + int var33 = var45; // L: 319 + var45 += var18; // L: 320 + int var10000 = var45 + var19; // L: 322 + this.verticesCount = var9; // L: 323 + this.faceCount = var10; // L: 324 + this.textureTriangleCount = var11; // L: 325 + this.verticesX = new int[var9]; // L: 326 + this.verticesY = new int[var9]; // L: 327 + this.verticesZ = new int[var9]; // L: 328 + this.indices1 = new int[var10]; // L: 329 + this.indices2 = new int[var10]; // L: 330 + this.indices3 = new int[var10]; // L: 331 + if (var11 > 0) { // L: 332 + this.textureRenderTypes = new byte[var11]; // L: 333 + this.texTriangleX = new short[var11]; // L: 334 + this.texTriangleY = new short[var11]; // L: 335 + this.texTriangleZ = new short[var11]; // L: 336 } - if (var16 == 1) { + if (var16 == 1) { // L: 338 this.vertexSkins = new int[var9]; } - if (var12 == 1) { - this.faceRenderTypes = new byte[var10]; - this.textureCoords = new byte[var10]; - this.faceTextures = new short[var10]; + if (var12 == 1) { // L: 339 + this.faceRenderTypes = new byte[var10]; // L: 340 + this.textureCoords = new byte[var10]; // L: 341 + this.faceTextures = new short[var10]; // L: 342 } - if (var13 == 255) { + if (var13 == 255) { // L: 344 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 345 } - if (var14 == 1) { + if (var14 == 1) { // L: 346 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 347 this.faceSkins = new int[var10]; } - 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; + this.faceColors = new short[var10]; // L: 348 + var4.offset = var21; // L: 349 + var5.offset = var32; // L: 350 + var6.offset = var33; // L: 351 + var7.offset = var45; // L: 352 + var8.offset = var27; // L: 353 + int var35 = 0; // L: 354 + int var36 = 0; // L: 355 + int var37 = 0; // L: 356 int var38; int var39; int var40; int var41; int var42; - for (var38 = 0; var38 < var9; ++var38) { - var39 = var4.readUnsignedByte(); - var40 = 0; - if ((var39 & 1) != 0) { + for (var38 = 0; var38 < var9; ++var38) { // L: 357 + var39 = var4.readUnsignedByte(); // L: 358 + var40 = 0; // L: 359 + if ((var39 & 1) != 0) { // L: 360 var40 = var5.readShortSmart(); } - var41 = 0; - if ((var39 & 2) != 0) { + var41 = 0; // L: 361 + if ((var39 & 2) != 0) { // L: 362 var41 = var6.readShortSmart(); } - var42 = 0; - if ((var39 & 4) != 0) { + var42 = 0; // L: 363 + if ((var39 & 4) != 0) { // L: 364 var42 = var7.readShortSmart(); } - 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.verticesX[var38] = var35 + var40; // L: 365 + this.verticesY[var38] = var36 + var41; // L: 366 + this.verticesZ[var38] = var37 + var42; // L: 367 + var35 = this.verticesX[var38]; // L: 368 + var36 = this.verticesY[var38]; // L: 369 + var37 = this.verticesZ[var38]; // L: 370 + if (var16 == 1) { // L: 371 this.vertexSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var30; - var5.offset = var26; - var6.offset = var24; - var7.offset = var28; - var8.offset = var25; + var4.offset = var30; // L: 373 + var5.offset = var26; // L: 374 + var6.offset = var24; // L: 375 + var7.offset = var28; // L: 376 + var8.offset = var25; // L: 377 - 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; + for (var38 = 0; var38 < var10; ++var38) { // L: 378 + this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 379 + if (var12 == 1) { // L: 380 + var39 = var5.readUnsignedByte(); // L: 381 + if ((var39 & 1) == 1) { // L: 382 + this.faceRenderTypes[var38] = 1; // L: 383 + var2 = true; // L: 384 } else { - this.faceRenderTypes[var38] = 0; + this.faceRenderTypes[var38] = 0; // L: 386 } - 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) { + if ((var39 & 2) == 2) { // L: 387 + this.textureCoords[var38] = (byte)(var39 >> 2); // L: 388 + this.faceTextures[var38] = this.faceColors[var38]; // L: 389 + this.faceColors[var38] = 127; // L: 390 + if (this.faceTextures[var38] != -1) { // L: 391 var3 = true; } } else { - this.textureCoords[var38] = -1; - this.faceTextures[var38] = -1; + this.textureCoords[var38] = -1; // L: 394 + this.faceTextures[var38] = -1; // L: 395 } } - if (var13 == 255) { + if (var13 == 255) { // L: 398 this.faceRenderPriorities[var38] = var6.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 399 this.faceAlphas[var38] = var7.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 400 this.faceSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var29; - var5.offset = var23; - var38 = 0; - var39 = 0; - var40 = 0; - var41 = 0; + var4.offset = var29; // L: 402 + var5.offset = var23; // L: 403 + var38 = 0; // L: 404 + var39 = 0; // L: 405 + var40 = 0; // L: 406 + var41 = 0; // L: 407 int var43; int var44; - 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; + for (var42 = 0; var42 < var10; ++var42) { // L: 408 + var43 = var5.readUnsignedByte(); // L: 409 + if (var43 == 1) { // L: 410 + var38 = var4.readShortSmart() + var41; // L: 411 + var39 = var4.readShortSmart() + var38; // L: 413 + var40 = var4.readShortSmart() + var39; // L: 415 + var41 = var40; // L: 416 + this.indices1[var42] = var38; // L: 417 + this.indices2[var42] = var39; // L: 418 + this.indices3[var42] = var40; // L: 419 } - 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 == 2) { // L: 421 + var39 = var40; // L: 422 + var40 = var4.readShortSmart() + var41; // L: 423 + var41 = var40; // L: 424 + this.indices1[var42] = var38; // L: 425 + this.indices2[var42] = var39; // L: 426 + this.indices3[var42] = var40; // L: 427 } - 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 == 3) { // L: 429 + var38 = var40; // L: 430 + var40 = var4.readShortSmart() + var41; // L: 431 + var41 = var40; // L: 432 + this.indices1[var42] = var38; // L: 433 + this.indices2[var42] = var39; // L: 434 + this.indices3[var42] = var40; // L: 435 } - 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; + if (var43 == 4) { // L: 437 + var44 = var38; // L: 438 + var38 = var39; // L: 439 + var39 = var44; // L: 440 + var40 = var4.readShortSmart() + var41; // L: 441 + var41 = var40; // L: 442 + this.indices1[var42] = var38; // L: 443 + this.indices2[var42] = var44; // L: 444 + this.indices3[var42] = var40; // L: 445 } } - var4.offset = var31; + var4.offset = var31; // L: 448 - 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(); + for (var42 = 0; var42 < var11; ++var42) { // L: 449 + this.textureRenderTypes[var42] = 0; // L: 450 + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 451 + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 452 + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 453 } - if (this.textureCoords != null) { - boolean var46 = false; + if (this.textureCoords != null) { // L: 455 + boolean var46 = false; // L: 456 - 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')) { + for (var43 = 0; var43 < var10; ++var43) { // L: 457 + var44 = this.textureCoords[var43] & 255; // L: 458 + if (var44 != 255) { // L: 459 + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 460 this.textureCoords[var43] = -1; } else { - var46 = true; + var46 = true; // L: 461 } } } - if (!var46) { + if (!var46) { // L: 464 this.textureCoords = null; } } - if (!var3) { + if (!var3) { // L: 466 this.faceTextures = null; } - if (!var2) { + if (!var2) { // L: 467 this.faceRenderTypes = null; } - } + } // L: 468 - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lgi;I)I" + descriptor = "(Lgk;I)I" ) - final int method4027(ModelData var1, int var2) { - int var3 = -1; - int var4 = var1.verticesX[var2]; - int var5 = var1.verticesY[var2]; - int var6 = var1.verticesZ[var2]; + final int method4123(ModelData var1, int var2) { + int var3 = -1; // L: 567 + int var4 = var1.verticesX[var2]; // L: 568 + int var5 = var1.verticesY[var2]; // L: 569 + int var6 = var1.verticesZ[var2]; // L: 570 - for (int var7 = 0; var7 < this.verticesCount; ++var7) { - if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { - var3 = var7; + for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 571 + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 572 + var3 = var7; // L: 573 break; } } - if (var3 == -1) { - this.verticesX[this.verticesCount] = var4; - this.verticesY[this.verticesCount] = var5; - this.verticesZ[this.verticesCount] = var6; - if (var1.vertexSkins != null) { + if (var3 == -1) { // L: 577 + this.verticesX[this.verticesCount] = var4; // L: 578 + this.verticesY[this.verticesCount] = var5; // L: 579 + this.verticesZ[this.verticesCount] = var6; // L: 580 + if (var1.vertexSkins != null) { // L: 581 this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - var3 = this.verticesCount++; + var3 = this.verticesCount++; // L: 582 } - return var3; + return var3; // L: 584 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lgi;" + descriptor = "()Lgk;" ) - public ModelData method4028() { - ModelData var1 = new ModelData(); - if (this.faceRenderTypes != null) { - var1.faceRenderTypes = new byte[this.faceCount]; + public ModelData method4115() { + ModelData var1 = new ModelData(); // L: 650 + if (this.faceRenderTypes != null) { // L: 651 + var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 - for (int var2 = 0; var2 < this.faceCount; ++var2) { + for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 653 var1.faceRenderTypes[var2] = this.faceRenderTypes[var2]; } } - 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; + var1.verticesCount = this.verticesCount; // L: 655 + var1.faceCount = this.faceCount; // L: 656 + var1.textureTriangleCount = this.textureTriangleCount; // L: 657 + var1.verticesX = this.verticesX; // L: 658 + var1.verticesY = this.verticesY; // L: 659 + var1.verticesZ = this.verticesZ; // L: 660 + var1.indices1 = this.indices1; // L: 661 + var1.indices2 = this.indices2; // L: 662 + var1.indices3 = this.indices3; // L: 663 + var1.faceRenderPriorities = this.faceRenderPriorities; // L: 664 + var1.faceAlphas = this.faceAlphas; // L: 665 + var1.textureCoords = this.textureCoords; // L: 666 + var1.faceColors = this.faceColors; // L: 667 + var1.faceTextures = this.faceTextures; // L: 668 + var1.priority = this.priority; // L: 669 + var1.textureRenderTypes = this.textureRenderTypes; // L: 670 + var1.texTriangleX = this.texTriangleX; // L: 671 + var1.texTriangleY = this.texTriangleY; // L: 672 + var1.texTriangleZ = this.texTriangleZ; // L: 673 + var1.vertexSkins = this.vertexSkins; // L: 674 + var1.faceSkins = this.faceSkins; // L: 675 + var1.vertexLabels = this.vertexLabels; // L: 676 + var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 677 + var1.vertexNormals = this.vertexNormals; // L: 678 + var1.faceNormals = this.faceNormals; // L: 679 + var1.ambient = this.ambient; // L: 680 + var1.contrast = this.contrast; // L: 681 + return var1; // L: 682 } - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgi;" + descriptor = "([[IIIIZI)Lgk;" ) - public ModelData method4083(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBounds(); - int var7 = var2 + this.field2274; - int var8 = var2 + this.field2275; - int var9 = var4 + this.field2277; - int var10 = var4 + this.field2244; - 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]) { + public ModelData method4135(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + this.calculateBounds(); // L: 686 + int var7 = var2 + this.field2278; // L: 687 + int var8 = var2 + this.field2275; // L: 688 + int var9 = var4 + this.field2267; // L: 689 + int var10 = var4 + this.field2280; // L: 690 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691 + var7 >>= 7; // L: 692 + var8 = var8 + 127 >> 7; // L: 693 + var9 >>= 7; // L: 694 + var10 = var10 + 127 >> 7; // L: 695 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 696 return this; } else { - ModelData var11 = new ModelData(); - var11.verticesCount = this.verticesCount; - var11.faceCount = this.faceCount; - var11.textureTriangleCount = this.textureTriangleCount; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceRenderTypes = this.faceRenderTypes; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.textureCoords = this.textureCoords; - var11.faceColors = this.faceColors; - var11.faceTextures = this.faceTextures; - var11.priority = this.priority; - var11.textureRenderTypes = this.textureRenderTypes; - var11.texTriangleX = this.texTriangleX; - var11.texTriangleY = this.texTriangleY; - var11.texTriangleZ = this.texTriangleZ; - var11.vertexSkins = this.vertexSkins; - var11.faceSkins = this.faceSkins; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.ambient = this.ambient; - var11.contrast = this.contrast; - var11.verticesY = new int[var11.verticesCount]; + ModelData var11 = new ModelData(); // L: 699 + var11.verticesCount = this.verticesCount; // L: 700 + var11.faceCount = this.faceCount; // L: 701 + var11.textureTriangleCount = this.textureTriangleCount; // L: 702 + var11.verticesX = this.verticesX; // L: 703 + var11.verticesZ = this.verticesZ; // L: 704 + var11.indices1 = this.indices1; // L: 705 + var11.indices2 = this.indices2; // L: 706 + var11.indices3 = this.indices3; // L: 707 + var11.faceRenderTypes = this.faceRenderTypes; // L: 708 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 709 + var11.faceAlphas = this.faceAlphas; // L: 710 + var11.textureCoords = this.textureCoords; // L: 711 + var11.faceColors = this.faceColors; // L: 712 + var11.faceTextures = this.faceTextures; // L: 713 + var11.priority = this.priority; // L: 714 + var11.textureRenderTypes = this.textureRenderTypes; // L: 715 + var11.texTriangleX = this.texTriangleX; // L: 716 + var11.texTriangleY = this.texTriangleY; // L: 717 + var11.texTriangleZ = this.texTriangleZ; // L: 718 + var11.vertexSkins = this.vertexSkins; // L: 719 + var11.faceSkins = this.faceSkins; // L: 720 + var11.vertexLabels = this.vertexLabels; // L: 721 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 722 + var11.ambient = this.ambient; // L: 723 + var11.contrast = this.contrast; // L: 724 + var11.verticesY = new int[var11.verticesCount]; // L: 725 int var12; int var13; int var14; @@ -1094,601 +1094,601 @@ public class ModelData extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + if (var6 == 0) { // L: 730 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 731 + var13 = var2 + this.verticesX[var12]; // L: 732 + var14 = var4 + this.verticesZ[var12]; // L: 733 + var15 = var13 & 127; // L: 734 + var16 = var14 & 127; // L: 735 + var17 = var13 >> 7; // L: 736 + var18 = var14 >> 7; // L: 737 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 738 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 739 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 740 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 741 } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 745 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 746 + if (var13 < var6) { // L: 747 + var14 = var2 + this.verticesX[var12]; // L: 748 + var15 = var4 + this.verticesZ[var12]; // L: 749 + var16 = var14 & 127; // L: 750 + var17 = var15 & 127; // L: 751 + var18 = var14 >> 7; // L: 752 + var19 = var15 >> 7; // L: 753 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 754 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 755 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 756 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 757 } } } - var11.invalidate(); - return var11; + var11.invalidate(); // L: 761 + return var11; // L: 762 } } else { return this; } } - @ObfuscatedName("e") - void method4030() { + @ObfuscatedName("y") + void method4147() { int[] var1; int var2; int var10002; int var3; int var4; - if (this.vertexSkins != null) { - var1 = new int[256]; - var2 = 0; + if (this.vertexSkins != null) { // L: 766 + var1 = new int[256]; // L: 767 + var2 = 0; // L: 768 - for (var3 = 0; var3 < this.verticesCount; ++var3) { - var4 = this.vertexSkins[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { + for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 769 + var4 = this.vertexSkins[var3]; // L: 770 + var10002 = var1[var4]++; // L: 771 + if (var4 > var2) { // L: 772 var2 = var4; } } - this.vertexLabels = new int[var2 + 1][]; + this.vertexLabels = new int[var2 + 1][]; // L: 774 - for (var3 = 0; var3 <= var2; ++var3) { - this.vertexLabels[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 775 + this.vertexLabels[var3] = new int[var1[var3]]; // L: 776 + var1[var3] = 0; // L: 777 } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { - var4 = this.vertexSkins[var3]; + for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 779 781 + var4 = this.vertexSkins[var3]; // L: 780 } - this.vertexSkins = null; + this.vertexSkins = null; // L: 783 } - if (this.faceSkins != null) { - var1 = new int[256]; - var2 = 0; + if (this.faceSkins != null) { // L: 785 + var1 = new int[256]; // L: 786 + var2 = 0; // L: 787 - for (var3 = 0; var3 < this.faceCount; ++var3) { - var4 = this.faceSkins[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { + for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 788 + var4 = this.faceSkins[var3]; // L: 789 + var10002 = var1[var4]++; // L: 790 + if (var4 > var2) { // L: 791 var2 = var4; } } - this.faceLabelsAlpha = new int[var2 + 1][]; + this.faceLabelsAlpha = new int[var2 + 1][]; // L: 793 - for (var3 = 0; var3 <= var2; ++var3) { - this.faceLabelsAlpha[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 794 + this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 795 + var1[var3] = 0; // L: 796 } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { - var4 = this.faceSkins[var3]; + for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 798 800 + var4 = this.faceSkins[var3]; // L: 799 } - this.faceSkins = null; + this.faceSkins = null; // L: 802 } - } + } // L: 804 - @ObfuscatedName("i") - public void method4031() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - this.verticesX[var1] = this.verticesZ[var1]; - this.verticesZ[var1] = -var2; + @ObfuscatedName("k") + public void method4158() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807 + int var2 = this.verticesX[var1]; // L: 808 + this.verticesX[var1] = this.verticesZ[var1]; // L: 809 + this.verticesZ[var1] = -var2; // L: 810 } - this.invalidate(); - } + this.invalidate(); // L: 812 + } // L: 813 - @ObfuscatedName("y") - public void method4032() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - this.verticesX[var1] = -this.verticesX[var1]; - this.verticesZ[var1] = -this.verticesZ[var1]; + @ObfuscatedName("t") + public void method4119() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816 + this.verticesX[var1] = -this.verticesX[var1]; // L: 817 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818 } - this.invalidate(); - } + this.invalidate(); // L: 820 + } // L: 821 - @ObfuscatedName("w") - public void method4033() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesZ[var1]; - this.verticesZ[var1] = this.verticesX[var1]; - this.verticesX[var1] = -var2; + @ObfuscatedName("l") + public void method4120() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824 + int var2 = this.verticesZ[var1]; // L: 825 + this.verticesZ[var1] = this.verticesX[var1]; // L: 826 + this.verticesX[var1] = -var2; // L: 827 } - this.invalidate(); - } + this.invalidate(); // L: 829 + } // L: 830 - @ObfuscatedName("g") - public void method4034(int var1) { - int var2 = ModelData_sine[var1]; - int var3 = ModelData_cosine[var1]; + @ObfuscatedName("u") + public void method4111(int var1) { + int var2 = ModelData_sine[var1]; // L: 833 + int var3 = ModelData_cosine[var1]; // L: 834 - 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; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 835 + int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 836 + this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 837 + this.verticesX[var4] = var5; // L: 838 } - this.invalidate(); - } + this.invalidate(); // L: 840 + } // L: 841 - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 + int[] var10000 = this.verticesX; // L: 845 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 846 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 847 var10000[var4] += var3; } - this.invalidate(); - } + this.invalidate(); // L: 849 + } // L: 850 - @ObfuscatedName("s") + @ObfuscatedName("z") @Export("recolor") public void recolor(short var1, short var2) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == var1) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 + if (this.faceColors[var3] == var1) { // L: 854 this.faceColors[var3] = var2; } } - } + } // L: 856 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("retexture") public void retexture(short var1, short var2) { - if (this.faceTextures != null) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceTextures != null) { // L: 859 + for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860 if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; + this.faceTextures[var3] = var2; // L: 861 } } } - } + } // L: 863 - @ObfuscatedName("b") - public void method4038() { + @ObfuscatedName("d") + public void method4125() { int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; } - for (var1 = 0; var1 < this.faceCount; ++var1) { - int var2 = this.indices1[var1]; - this.indices1[var1] = this.indices3[var1]; - this.indices3[var1] = var2; + for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 867 + int var2 = this.indices1[var1]; // L: 868 + this.indices1[var1] = this.indices3[var1]; // L: 869 + this.indices3[var1] = var2; // L: 870 } - this.invalidate(); - } + this.invalidate(); // L: 872 + } // L: 873 - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("resize") public void resize(int var1, int var2, int var3) { - 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; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 878 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 879 } - this.invalidate(); - } + this.invalidate(); // L: 881 + } // L: 882 - @ObfuscatedName("p") + @ObfuscatedName("m") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals == null) { - this.vertexNormals = new VertexNormal[this.verticesCount]; + if (this.vertexNormals == null) { // L: 885 + this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886 int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 887 this.vertexNormals[var1] = new VertexNormal(); } - for (var1 = 0; var1 < this.faceCount; ++var1) { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - int var5 = this.verticesX[var3] - this.verticesX[var2]; - int var6 = this.verticesY[var3] - this.verticesY[var2]; - int var7 = this.verticesZ[var3] - this.verticesZ[var2]; - int var8 = this.verticesX[var4] - this.verticesX[var2]; - int var9 = this.verticesY[var4] - this.verticesY[var2]; - int var10 = this.verticesZ[var4] - this.verticesZ[var2]; - int var11 = var6 * var10 - var9 * var7; - int var12 = var7 * var8 - var10 * var5; + for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 888 + int var2 = this.indices1[var1]; // L: 889 + int var3 = this.indices2[var1]; // L: 890 + int var4 = this.indices3[var1]; // L: 891 + int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 892 + int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 893 + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 894 + int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 895 + int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 896 + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 897 + int var11 = var6 * var10 - var9 * var7; // L: 898 + int var12 = var7 * var8 - var10 * var5; // L: 899 int var13; - for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { - var11 >>= 1; - var12 >>= 1; + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 900 901 904 + var11 >>= 1; // L: 902 + var12 >>= 1; // L: 903 } - int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); - if (var14 <= 0) { + int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 906 + if (var14 <= 0) { // L: 907 var14 = 1; } - var11 = var11 * 256 / var14; - var12 = var12 * 256 / var14; - var13 = var13 * 256 / var14; + var11 = var11 * 256 / var14; // L: 908 + var12 = var12 * 256 / var14; // L: 909 + var13 = var13 * 256 / var14; // L: 910 byte var15; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 912 var15 = 0; } else { - var15 = this.faceRenderTypes[var1]; + var15 = this.faceRenderTypes[var1]; // L: 913 } - 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) { + if (var15 == 0) { // L: 914 + VertexNormal var16 = this.vertexNormals[var2]; // L: 916 + var16.x += var11; // L: 917 + var16.y += var12; // L: 918 + var16.z += var13; // L: 919 + ++var16.magnitude; // L: 920 + var16 = this.vertexNormals[var3]; // L: 921 + var16.x += var11; // L: 922 + var16.y += var12; // L: 923 + var16.z += var13; // L: 924 + ++var16.magnitude; // L: 925 + var16 = this.vertexNormals[var4]; // L: 926 + var16.x += var11; // L: 927 + var16.y += var12; // L: 928 + var16.z += var13; // L: 929 + ++var16.magnitude; // L: 930 + } else if (var15 == 1) { // L: 932 + if (this.faceNormals == null) { // L: 933 this.faceNormals = new FaceNormal[this.faceCount]; } - FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); - var17.x = var11; - var17.y = var12; - var17.z = var13; + FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 934 + var17.x = var11; // L: 935 + var17.y = var12; // L: 936 + var17.z = var13; // L: 937 } } } - } + } // L: 940 - @ObfuscatedName("z") + @ObfuscatedName("c") @Export("invalidate") void invalidate() { - this.vertexNormals = null; - this.vertexVertices = null; - this.faceNormals = null; - this.isBoundsCalculated = false; - } + this.vertexNormals = null; // L: 943 + this.vertexVertices = null; // L: 944 + this.faceNormals = null; // L: 945 + this.isBoundsCalculated = false; // L: 946 + } // L: 947 - @ObfuscatedName("h") + @ObfuscatedName("f") @Export("calculateBounds") void calculateBounds() { - if (!this.isBoundsCalculated) { - super.height = 0; - this.field2273 = 0; - this.field2274 = 999999; - this.field2275 = -999999; - this.field2244 = -99999; - this.field2277 = 99999; + if (!this.isBoundsCalculated) { // L: 950 + super.height = 0; // L: 951 + this.field2277 = 0; // L: 952 + this.field2278 = 999999; // L: 953 + this.field2275 = -999999; // L: 954 + this.field2280 = -99999; // L: 955 + this.field2267 = 99999; // L: 956 - 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.field2274) { - this.field2274 = var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 + int var2 = this.verticesX[var1]; // L: 958 + int var3 = this.verticesY[var1]; // L: 959 + int var4 = this.verticesZ[var1]; // L: 960 + if (var2 < this.field2278) { // L: 961 + this.field2278 = var2; } - if (var2 > this.field2275) { + if (var2 > this.field2275) { // L: 962 this.field2275 = var2; } - if (var4 < this.field2277) { - this.field2277 = var4; + if (var4 < this.field2267) { // L: 963 + this.field2267 = var4; } - if (var4 > this.field2244) { - this.field2244 = var4; + if (var4 > this.field2280) { // L: 964 + this.field2280 = var4; } - if (-var3 > super.height) { + if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field2273) { - this.field2273 = var3; + if (var3 > this.field2277) { // L: 966 + this.field2277 = var3; } } - this.isBoundsCalculated = true; + this.isBoundsCalculated = true; // L: 968 } - } + } // L: 969 - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIII)Lhl;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { - 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]; + this.calculateVertexNormals(); // L: 1028 + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029 + int var7 = var6 * var2 >> 8; // L: 1030 + Model var8 = new Model(); // L: 1031 + var8.faceColors1 = new int[this.faceCount]; // L: 1032 + var8.faceColors2 = new int[this.faceCount]; // L: 1033 + var8.faceColors3 = new int[this.faceCount]; // L: 1034 + if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1035 + int[] var9 = new int[this.textureTriangleCount]; // L: 1036 int var10; - for (var10 = 0; var10 < this.faceCount; ++var10) { - if (this.textureCoords[var10] != -1) { + for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1037 + if (this.textureCoords[var10] != -1) { // L: 1038 ++var9[this.textureCoords[var10] & 255]; } } - var8.field2570 = 0; + var8.field2522 = 0; // L: 1040 - for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { - if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2570; + for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 + ++var8.field2522; } } - var8.field2525 = new int[var8.field2570]; - var8.field2526 = new int[var8.field2570]; - var8.field2527 = new int[var8.field2570]; - var10 = 0; + var8.field2529 = new int[var8.field2522]; // L: 1044 + var8.field2530 = new int[var8.field2522]; // L: 1045 + var8.field2538 = new int[var8.field2522]; // L: 1046 + var10 = 0; // L: 1047 int var11; - for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { - if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2525[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2526[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2527[var10] = this.texTriangleZ[var11] & '\uffff'; - var9[var11] = var10++; + for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 + var8.field2529[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field2530[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field2538[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var9[var11] = var10++; // L: 1053 } else { - var9[var11] = -1; + var9[var11] = -1; // L: 1055 } } - var8.field2504 = new byte[this.faceCount]; + var8.field2566 = new byte[this.faceCount]; // L: 1057 - for (var11 = 0; var11 < this.faceCount; ++var11) { - if (this.textureCoords[var11] != -1) { - var8.field2504[var11] = (byte)var9[this.textureCoords[var11] & 255]; + for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 + if (this.textureCoords[var11] != -1) { // L: 1059 + var8.field2566[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2504[var11] = -1; + var8.field2566[var11] = -1; // L: 1060 } } } - for (int var16 = 0; var16 < this.faceCount; ++var16) { + for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1063 byte var17; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 1065 var17 = 0; } else { - var17 = this.faceRenderTypes[var16]; + var17 = this.faceRenderTypes[var16]; // L: 1066 } byte var18; - if (this.faceAlphas == null) { + if (this.faceAlphas == null) { // L: 1068 var18 = 0; } else { - var18 = this.faceAlphas[var16]; + var18 = this.faceAlphas[var16]; // L: 1069 } short var12; - if (this.faceTextures == null) { + if (this.faceTextures == null) { // L: 1071 var12 = -1; } else { - var12 = this.faceTextures[var16]; + var12 = this.faceTextures[var16]; // L: 1072 } - if (var18 == -2) { + if (var18 == -2) { // L: 1073 var17 = 3; } - if (var18 == -1) { + if (var18 == -1) { // L: 1074 var17 = 2; } VertexNormal var13; int var14; FaceNormal var19; - 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] = method4071(this.faceColors[var16] & '\uffff', var14); - var8.faceColors3[var16] = -1; - } else if (var17 == 3) { - var8.faceColors1[var16] = 128; - var8.faceColors3[var16] = -1; + if (var12 == -1) { // L: 1075 + if (var17 != 0) { // L: 1076 + if (var17 == 1) { // L: 1093 + var19 = this.faceNormals[var16]; // L: 1094 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095 + var8.faceColors1[var16] = method4132(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors3[var16] = -1; // L: 1097 + } else if (var17 == 3) { // L: 1099 + var8.faceColors1[var16] = 128; // L: 1100 + var8.faceColors3[var16] = -1; // L: 1101 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1104 } } else { - int var15 = this.faceColors[var16] & '\uffff'; - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { + int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1080 var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method4071(var15, var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 + var8.faceColors1[var16] = method4132(var15, var14); // L: 1083 + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1084 var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method4071(var15, var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 + var8.faceColors2[var16] = method4132(var15, var14); // L: 1087 + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1088 var13 = this.vertexVertices[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method4071(var15, var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 + var8.faceColors3[var16] = method4132(var15, var14); // L: 1091 } - } 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] = method4046(var14); - var8.faceColors3[var16] = -1; + } else if (var17 != 0) { // L: 1108 + if (var17 == 1) { // L: 1124 + var19 = this.faceNormals[var16]; // L: 1125 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 + var8.faceColors1[var16] = method4133(var14); // L: 1127 + var8.faceColors3[var16] = -1; // L: 1128 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1131 } } else { - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1111 var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method4046(var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 + var8.faceColors1[var16] = method4133(var14); // L: 1114 + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1115 var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method4046(var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 + var8.faceColors2[var16] = method4133(var14); // L: 1118 + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1119 var13 = this.vertexVertices[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method4046(var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 + var8.faceColors3[var16] = method4133(var14); // L: 1122 } } - this.method4030(); - 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.field2523 = this.priority; - var8.vertexLabels = this.vertexLabels; - var8.faceLabelsAlpha = this.faceLabelsAlpha; - var8.faceTextures = this.faceTextures; - return var8; + this.method4147(); // L: 1135 + var8.verticesCount = this.verticesCount; // L: 1136 + var8.verticesX = this.verticesX; // L: 1137 + var8.verticesY = this.verticesY; // L: 1138 + var8.verticesZ = this.verticesZ; // L: 1139 + var8.indicesCount = this.faceCount; // L: 1140 + var8.indices1 = this.indices1; // L: 1141 + var8.indices2 = this.indices2; // L: 1142 + var8.indices3 = this.indices3; // L: 1143 + var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 + var8.faceAlphas = this.faceAlphas; // L: 1145 + var8.field2527 = this.priority; // L: 1146 + var8.vertexLabels = this.vertexLabels; // L: 1147 + var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 + var8.faceTextures = this.faceTextures; // L: 1149 + return var8; // L: 1150 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;II)Lgi;" + descriptor = "(Lko;II)Lgk;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new ModelData(var3); + byte[] var3 = var0.takeFile(var1, var2); // L: 53 + return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgi;Lgi;IIIZ)V" + descriptor = "(Lgk;Lgk;IIIZ)V" ) - static void method4043(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { - var0.calculateBounds(); - var0.calculateVertexNormals(); - var1.calculateBounds(); - var1.calculateVertexNormals(); - ++field2280; - int var6 = 0; - int[] var7 = var1.verticesX; - int var8 = var1.verticesCount; + static void method4130(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + var0.calculateBounds(); // L: 972 + var0.calculateVertexNormals(); // L: 973 + var1.calculateBounds(); // L: 974 + var1.calculateVertexNormals(); // L: 975 + ++field2269; // L: 976 + int var6 = 0; // L: 977 + int[] var7 = var1.verticesX; // L: 978 + int var8 = var1.verticesCount; // L: 979 int var9; - 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.field2273) { - int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field2274 && var12 <= var1.field2275) { - int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field2277 && var13 <= var1.field2244) { - 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) { + for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 980 + VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 + if (var10.magnitude != 0) { // L: 982 + int var11 = var0.verticesY[var9] - var3; // L: 983 + if (var11 <= var1.field2277) { // L: 984 + int var12 = var0.verticesX[var9] - var2; // L: 985 + if (var12 >= var1.field2278 && var12 <= var1.field2275) { // L: 986 + int var13 = var0.verticesZ[var9] - var4; // L: 987 + if (var13 >= var1.field2267 && var13 <= var1.field2280) { // L: 988 + for (int var14 = 0; var14 < var8; ++var14) { // L: 989 + VertexNormal var15 = var1.vertexNormals[var14]; // L: 990 + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991 + if (var0.vertexVertices == null) { // L: 992 var0.vertexVertices = new VertexNormal[var0.verticesCount]; } - if (var1.vertexVertices == null) { + if (var1.vertexVertices == null) { // L: 993 var1.vertexVertices = new VertexNormal[var8]; } - VertexNormal var16 = var0.vertexVertices[var9]; - if (var16 == null) { + VertexNormal var16 = var0.vertexVertices[var9]; // L: 994 + if (var16 == null) { // L: 995 var16 = var0.vertexVertices[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.vertexVertices[var14]; + VertexNormal var17 = var1.vertexVertices[var14]; // L: 996 if (var17 == null) { - var17 = var1.vertexVertices[var14] = new VertexNormal(var15); + var17 = var1.vertexVertices[var14] = new VertexNormal(var15); // L: 997 } - 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; - field2253[var9] = field2280; - field2254[var14] = field2280; + var16.x += var15.x; // L: 998 + var16.y += var15.y; // L: 999 + var16.z += var15.z; // L: 1000 + var16.magnitude += var15.magnitude; // L: 1001 + var17.x += var10.x; // L: 1002 + var17.y += var10.y; // L: 1003 + var17.z += var10.z; // L: 1004 + var17.magnitude += var10.magnitude; // L: 1005 + ++var6; // L: 1006 + field2255[var9] = field2269; // L: 1007 + field2283[var14] = field2269; // L: 1008 } } } @@ -1697,50 +1697,50 @@ public class ModelData extends Renderable { } } - if (var6 >= 3 && var5) { - for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field2253[var0.indices1[var9]] == field2280 && field2253[var0.indices2[var9]] == field2280 && field2253[var0.indices3[var9]] == field2280) { - if (var0.faceRenderTypes == null) { + if (var6 >= 3 && var5) { // L: 1012 + for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 + if (field2255[var0.indices1[var9]] == field2269 && field2255[var0.indices2[var9]] == field2269 && field2255[var0.indices3[var9]] == field2269) { // L: 1014 + if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } - var0.faceRenderTypes[var9] = 2; + var0.faceRenderTypes[var9] = 2; // L: 1016 } } - for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field2280 == field2254[var1.indices1[var9]] && field2280 == field2254[var1.indices2[var9]] && field2280 == field2254[var1.indices3[var9]]) { - if (var1.faceRenderTypes == null) { + for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 + if (field2269 == field2283[var1.indices1[var9]] && field2269 == field2283[var1.indices2[var9]] && field2269 == field2283[var1.indices3[var9]]) { // L: 1020 + if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } - var1.faceRenderTypes[var9] = 2; + var1.faceRenderTypes[var9] = 2; // L: 1022 } } } - } + } // L: 1025 - @ObfuscatedName("n") - static final int method4071(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("ag") + static final int method4132(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1154 + if (var1 < 2) { // L: 1155 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1156 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1157 } - @ObfuscatedName("u") - static final int method4046(int var0) { - if (var0 < 2) { + @ObfuscatedName("ae") + static final int method4133(int var0) { + if (var0 < 2) { // L: 1161 var0 = 2; } else if (var0 > 126) { - var0 = 126; + var0 = 126; // L: 1162 } - return var0; + return var0; // L: 1163 } } diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 3453f85bb6..ab3a1e11b5 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,28 +1,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hc") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = 1954904169 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - ModelData0() { - } + } // L: 4 - @ObfuscatedName("l") + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(I)[Lip;", - garbageValue = "499045866" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-320838712" ) - static LoginPacket[] method4562() { - return new LoginPacket[]{LoginPacket.field2888, LoginPacket.field2889, LoginPacket.field2885, LoginPacket.field2891, LoginPacket.field2884, LoginPacket.field2886}; - } + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9298 + if (Client.menuOptionsCount < 500) { // L: 9299 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9300 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9301 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9302 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9303 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9304 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9305 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9306 + ++Client.menuOptionsCount; // L: 9307 + } + + } + } // L: 9309 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 87c4d7d83b..28b96c02b4 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,394 +9,306 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ah") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("j") + @ObfuscatedName("ph") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Leg;" + ) + @Export("mouseWheel") + static class144 mouseWheel; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lah;" ) @Export("MouseHandler_instance") static MouseHandler MouseHandler_instance; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1516853091 + intValue = 1036288491 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -422885389 + ) + @Export("MouseHandler_currentButtonVolatile") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -19196403 + ) + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 197302675 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("j") + @ObfuscatedGetter( + longValue = 8130240115469217441L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1212092085 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1137004173 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = 8667664769144098865L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1104277309 + intValue = 1769064135 ) @Export("MouseHandler_x") public static int MouseHandler_x; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 894761523 - ) - @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -673069961 - ) - @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 24690515 - ) - @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -740984488231653733L - ) - @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = -1355504992278167911L - ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 683077407 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 2082398241 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1841633553 + intValue = 1482494963 ) @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1813524919 + intValue = 363259853 ) @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1656092401 + intValue = 1639433965 ) @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 9065721918317991793L + longValue = -7568180939030180395L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1586364571 + intValue = 307748861 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 336686179 + intValue = -994811429 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -8907389 + intValue = 1483939719 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = 1174004619361524505L + longValue = 5932498801769663649L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("bs") - @ObfuscatedGetter( - intValue = -548135093 + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lkz;" ) - static int field236; - @ObfuscatedName("ot") + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = -820968183 + intValue = 1129600087 ) - @Export("widgetDragDuration") - static int widgetDragDuration; + @Export("selectedItemWidget") + static int selectedItemWidget; static { - MouseHandler_instance = new MouseHandler(); - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = -1L; - MouseHandler_currentButton = 0; + 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; - 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_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() { - } + } // L: 34 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;S)I", - garbageValue = "961" + descriptor = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "-42" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); - if (!var1.isAltDown() && var2 != 2) { - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; + int var2 = var1.getButton(); // L: 70 + if (!var1.isAltDown() && var2 != 2) { // L: 71 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 72 73 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = var1.getX(); - MouseHandler_yVolatile = var1.getY(); - MouseHandler_lastMovedVolatile = var1.getWhen(); + if (MouseHandler_instance != null) { // L: 118 + MouseHandler_idleCycles = 0; // L: 119 + MouseHandler_xVolatile = var1.getX(); // L: 120 + MouseHandler_yVolatile = var1.getY(); // L: 121 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 122 } - } + } // L: 124 + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 97 + var1.consume(); + } + + } // L: 98 + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } // L: 102 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 105 + MouseHandler_idleCycles = 0; // L: 106 + MouseHandler_xVolatile = -1; // L: 107 + MouseHandler_yVolatile = -1; // L: 108 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 109 + } + + } // L: 111 + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 114 + } // L: 115 + + public final void focusGained(FocusEvent var1) { + } // L: 126 + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { // L: 129 + MouseHandler_currentButtonVolatile = 0; + } + + } // L: 130 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = UserComparator4.method2406(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { + if (MouseHandler_instance != null) { // L: 77 + MouseHandler_idleCycles = 0; // L: 78 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 79 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 80 + MouseHandler_lastPressedTimeMillisVolatile = class111.method2516(); // L: 81 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 82 + if (MouseHandler_lastButtonVolatile != 0) { // L: 83 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 85 var1.consume(); } - } + } // L: 86 public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; + if (MouseHandler_instance != null) { // L: 89 + MouseHandler_idleCycles = 0; // L: 90 + MouseHandler_currentButtonVolatile = 0; // L: 91 } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 93 var1.consume(); } - } + } // L: 94 - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final void focusGained(FocusEvent var1) { - } - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = var1.getWhen(); - } - - } - - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;I)I", - garbageValue = "-853265769" + descriptor = "(IB)Lfm;", + garbageValue = "58" ) - static int method614(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - String[] var3 = Login.field890; - - int var4; - String var5; - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var0.tryLoadFileByNames(var5, "")) { - ++var2; + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 + if (var1 != null) { // L: 36 + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 + var1 = new SequenceDefinition(); // L: 38 + if (var2 != null) { // L: 39 + var1.decode(new Buffer(var2)); } + + var1.postDecode(); // L: 40 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41 + return var1; // L: 42 } - - var3 = Login.field907; - - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var1.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - return var2; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1631875513" - ) - static final void method586(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - class281.field3323[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2114853000" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lpg;" ) - static final int method612(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return var1; + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 99 + var2 = (RunException)var0; // L: 100 + var2.message = var2.message + ' ' + var1; // L: 101 } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + var2 = new RunException(var0, var1); // L: 103 } + + return var2; // L: 104 } - @ObfuscatedName("fe") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-74151640" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1583806912" ) - static final void method611() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - class116.updateActorSequence(var3, 1); - } - } - + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 } - @ObfuscatedName("jo") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([Ljt;II)V", - garbageValue = "-2051295556" + descriptor = "(IS)I", + garbageValue = "15047" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - ItemContainer.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - ViewportMouse.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = HealthBarUpdate.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - ViewportMouse.runScriptEvent(var5); - } - } - } - + static int method626(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field801 - 7.0D) * 256.0D); // L: 3634 } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index a120cb0f2c..0e7b7e9283 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,110 +1,134 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cg") +@ObfuscatedName("ci") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1289779463 - ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("de") + @ObfuscatedName("t") + static int[] field1039; + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Loe;" ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("l") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("i") @Export("isRunning") boolean isRunning; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("lock") Object lock; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 70944461 + intValue = 1216994745 ) @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("xs") int[] xs; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("ys") int[] ys; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("millis") long[] millis; MouseRecorder() { - 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]; - } + 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 public void run() { - for (; this.isRunning; class121.method2542(50L)) { - synchronized(this.lock) { - if (this.index < 500) { - this.xs[this.index] = MouseHandler.MouseHandler_x; - this.ys[this.index] = MouseHandler.MouseHandler_y; - this.millis[this.index] = MouseHandler.MouseHandler_millis; - ++this.index; + for (; this.isRunning; FloorUnderlayDefinition.method3190(50L)) { // L: 17 26 + synchronized(this.lock) { // L: 18 + if (this.index < 500) { // L: 19 + this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 + this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21 + this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22 + ++this.index; // L: 23 } } } - } + } // L: 28 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-76927073" + descriptor = "(Lko;B)V", + garbageValue = "-12" ) - public static void method2078(int var0, int var1) { - VarbitComposition var2 = AttackOption.method2263(var0); - int var3 = var2.baseVar; - int var4 = var2.startBit; - int var5 = var2.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - if (var1 < 0 || var1 > var6) { - var1 = 0; - } + public static void method2093(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 15 + } // L: 16 - var6 <<= var4; - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "355383775" + ) + static int method2089(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1365 + var5 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1366 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.itemId; // L: 1367 + return 1; // L: 1368 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1370 + var5 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1371 + if (var5.itemId != -1) { // L: 1372 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1373 + } + + return 1; // L: 1374 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1376 + int var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1377 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1378 + if (var4 != null) { // L: 1379 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1380 + } + + return 1; // L: 1381 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1383 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1384 + return 1; // L: 1385 + } else { + return 2; // L: 1387 + } } - @ObfuscatedName("gn") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(ZB)V", + descriptor = "([Ljf;Ljf;ZB)V", garbageValue = "0" ) - static final void method2075(boolean var0) { - class356.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2706, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; - } - } - + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1040080419 * -992722549 : var1.width * -1492995549 * 1571065227; // L: 10229 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1297742855 * -1412739511 : var1.height * 380936511 * 1623576255; // L: 10230 + WorldMapLabelSize.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10231 + if (var1.children != null) { // L: 10232 + WorldMapLabelSize.resizeInterface(var1.children, var1.id, var3, var4, var2); } - } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10233 + if (var5 != null) { + SecureRandomCallable.method2051(var5.group, var3, var4, var2); // L: 10234 + } + + if (var1.contentType == 1337) { // L: 10235 + } + + } // L: 10236 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 5bfbdff338..e2c05332bd 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kl") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 988e9a5a53..6eeff91988 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,53 +7,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("c") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements class144, MouseWheelListener { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1769079383 + intValue = 403973473 ) @Export("rotation") int rotation; MouseWheelHandler() { - this.rotation = 0; - } + this.rotation = 0; // L: 8 + } // L: 10 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-635346378" + garbageValue = "-1467491328" ) @Export("addTo") void addTo(Component var1) { - var1.addMouseWheelListener(this); - } + var1.addMouseWheelListener(this); // L: 13 + } // L: 14 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;S)V", - garbageValue = "-29045" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-330102118" ) @Export("removeFrom") void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); - } + var1.removeMouseWheelListener(this); // L: 17 + } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "459838731" + garbageValue = "-1160529550" ) @Export("useRotation") public synchronized int useRotation() { - int var1 = this.rotation; - this.rotation = 0; - return var1; + int var1 = this.rotation; // L: 26 + this.rotation = 0; // L: 27 + return var1; // L: 28 } public synchronized void mouseWheelMoved(MouseWheelEvent var1) { - this.rotation += var1.getWheelRotation(); - } + this.rotation += var1.getWheelRotation(); // L: 22 + } // L: 23 } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 7c15d2f300..6b6676b4aa 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,57 +1,59 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iq") +@ObfuscatedName("iy") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1265498165 + intValue = -797794259 ) - int field2969; - @ObfuscatedName("q") + int field2973; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Laa;" + descriptor = "[Laz;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("f") - short[] field2965; - @ObfuscatedName("j") - byte[] field2966; - @ObfuscatedName("m") - byte[] field2970; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "[Lil;" - ) - MusicPatchNode2[] field2968; - @ObfuscatedName("t") - byte[] field2964; + @ObfuscatedName("s") + short[] field2972; @ObfuscatedName("a") - int[] field2967; + byte[] field2974; + @ObfuscatedName("o") + byte[] field2971; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "[Lif;" + ) + MusicPatchNode2[] field2976; + @ObfuscatedName("e") + byte[] field2977; + @ObfuscatedName("p") + int[] field2975; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; - this.field2965 = new short[128]; - this.field2966 = new byte[128]; - this.field2970 = new byte[128]; - this.field2968 = new MusicPatchNode2[128]; - this.field2964 = new byte[128]; - this.field2967 = new int[128]; - Buffer var2 = new Buffer(var1); + this.rawSounds = new RawSound[128]; // L: 21 + this.field2972 = new short[128]; // L: 22 + this.field2974 = new byte[128]; // L: 23 + this.field2971 = new byte[128]; // L: 24 + this.field2976 = new MusicPatchNode2[128]; // L: 25 + this.field2977 = new byte[128]; // L: 26 + this.field2975 = new int[128]; // L: 27 + Buffer var2 = new Buffer(var1); // L: 28 int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 } byte[] var4 = new byte[var3]; int var5; - for (var5 = 0; var5 < var3; ++var5) { + for (var5 = 0; var5 < var3; ++var5) { // L: 32 var4[var5] = var2.readByte(); } @@ -88,243 +90,243 @@ public class MusicPatch extends Node { ++var2.offset; ++var9; - byte[] var36 = new byte[var9]; + byte[] var38 = new byte[var9]; int var12; int var14; - if (var9 > 1) { - var36[1] = 1; + if (var9 > 1) { // L: 53 + var38[1] = 1; // L: 54 int var13 = 1; var12 = 2; for (var14 = 2; var14 < var9; ++var14) { - int var41 = var2.readUnsignedByte(); - if (var41 == 0) { + int var43 = var2.readUnsignedByte(); // L: 58 + if (var43 == 0) { var13 = var12++; } else { - if (var41 <= var13) { - --var41; + if (var43 <= var13) { // L: 61 + --var43; } - var13 = var41; + var13 = var43; // L: 62 } - var36[var14] = (byte)var13; + var38[var14] = (byte)var13; // L: 64 } } else { - var12 = var9; + var12 = var9; // L: 67 } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68 MusicPatchNode2 var15; - for (var14 = 0; var14 < var37.length; ++var14) { - var15 = var37[var14] = new MusicPatchNode2(); - int var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field2903 = new byte[var40 * 2]; + for (var14 = 0; var14 < var39.length; ++var14) { // L: 69 + var15 = var39[var14] = new MusicPatchNode2(); // L: 70 + int var42 = var2.readUnsignedByte(); // L: 71 + if (var42 > 0) { // L: 72 + var15.field2916 = new byte[var42 * 2]; } - var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field2901 = new byte[var40 * 2 + 2]; - var15.field2901[1] = 64; + var42 = var2.readUnsignedByte(); // L: 73 + if (var42 > 0) { // L: 74 + var15.field2914 = new byte[var42 * 2 + 2]; // L: 75 + var15.field2914[1] = 64; // L: 76 } } - var14 = var2.readUnsignedByte(); - byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; - var14 = var2.readUnsignedByte(); - byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); // L: 79 + byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 + var14 = var2.readUnsignedByte(); // L: 81 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 } - byte[] var18 = new byte[var17]; + byte[] var18 = new byte[var17]; // L: 85 int var19; - for (var19 = 0; var19 < var17; ++var19) { + for (var19 = 0; var19 < var17; ++var19) { // L: 86 var18[var19] = var2.readByte(); } - ++var2.offset; - ++var17; - var19 = 0; + ++var2.offset; // L: 87 + ++var17; // L: 88 + var19 = 0; // L: 89 int var20; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.field2965[var20] = (short)var19; + for (var20 = 0; var20 < 128; ++var20) { // L: 90 + var19 += var2.readUnsignedByte(); // L: 91 + this.field2972[var20] = (short)var19; // L: 92 } - var19 = 0; + var19 = 0; // L: 94 - short[] var48; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - var48 = this.field2965; - var48[var20] = (short)(var48[var20] + (var19 << 8)); + short[] var50; + for (var20 = 0; var20 < 128; ++var20) { // L: 95 + var19 += var2.readUnsignedByte(); // L: 96 + var50 = this.field2972; // L: 97 + var50[var20] = (short)(var50[var20] + (var19 << 8)); } - var20 = 0; - int var21 = 0; - int var22 = 0; + var20 = 0; // L: 99 + int var21 = 0; // L: 100 + int var22 = 0; // L: 101 int var23; - for (var23 = 0; var23 < 128; ++var23) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var23 = 0; var23 < 128; ++var23) { // L: 102 + if (var20 == 0) { // L: 103 + if (var21 < var18.length) { // L: 104 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 105 } - var22 = var2.readVarInt(); + var22 = var2.readVarInt(); // L: 106 } - var48 = this.field2965; - var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2967[var23] = var22; - --var20; + var50 = this.field2972; // L: 108 + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field2975[var23] = var22; // L: 109 + --var20; // L: 110 } - var20 = 0; - var21 = 0; - var23 = 0; + var20 = 0; // L: 112 + var21 = 0; // L: 113 + var23 = 0; // L: 114 int var24; - for (var24 = 0; var24 < 128; ++var24) { - if (this.field2967[var24] != 0) { - if (var20 == 0) { - if (var21 < var4.length) { + for (var24 = 0; var24 < 128; ++var24) { // L: 115 + if (this.field2975[var24] != 0) { // L: 116 + if (var20 == 0) { // L: 117 + if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; } else { - var20 = -1; + var20 = -1; // L: 119 } - var23 = var2.array[var5++] - 1; + var23 = var2.array[var5++] - 1; // L: 120 } - this.field2964[var24] = (byte)var23; - --var20; + this.field2977[var24] = (byte)var23; // L: 122 + --var20; // L: 123 } } - var20 = 0; - var21 = 0; - var24 = 0; + var20 = 0; // L: 125 + var21 = 0; // L: 126 + var24 = 0; // L: 127 - for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2967[var25] != 0) { - if (var20 == 0) { - if (var21 < var7.length) { + for (int var25 = 0; var25 < 128; ++var25) { // L: 128 + if (this.field2975[var25] != 0) { // L: 129 + if (var20 == 0) { // L: 130 + if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; } else { - var20 = -1; + var20 = -1; // L: 132 } - var24 = var2.array[var8++] + 16 << 2; + var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field2970[var25] = (byte)var24; - --var20; + this.field2971[var25] = (byte)var24; // L: 135 + --var20; // L: 136 } } - var20 = 0; - var21 = 0; - MusicPatchNode2 var38 = null; + var20 = 0; // L: 138 + var21 = 0; // L: 139 + MusicPatchNode2 var40 = null; // L: 140 int var26; - for (var26 = 0; var26 < 128; ++var26) { - if (this.field2967[var26] != 0) { - if (var20 == 0) { - var38 = var37[var36[var21]]; - if (var21 < var10.length) { + for (var26 = 0; var26 < 128; ++var26) { // L: 141 + if (this.field2975[var26] != 0) { // L: 142 + if (var20 == 0) { // L: 143 + var40 = var39[var38[var21]]; // L: 144 + if (var21 < var10.length) { // L: 145 var20 = var10[var21++]; } else { - var20 = -1; + var20 = -1; // L: 146 } } - this.field2968[var26] = var38; - --var20; + this.field2976[var26] = var40; // L: 148 + --var20; // L: 149 } } - var20 = 0; - var21 = 0; - var26 = 0; + var20 = 0; // L: 151 + var21 = 0; // L: 152 + var26 = 0; // L: 153 int var27; - for (var27 = 0; var27 < 128; ++var27) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var27 = 0; var27 < 128; ++var27) { // L: 154 + if (var20 == 0) { // L: 155 + if (var21 < var18.length) { // L: 156 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 157 } - if (this.field2967[var27] > 0) { + if (this.field2975[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field2966[var27] = (byte)var26; - --var20; + this.field2974[var27] = (byte)var26; // L: 160 + --var20; // L: 161 } - this.field2969 = var2.readUnsignedByte() + 1; + this.field2973 = var2.readUnsignedByte() + 1; // L: 163 int var29; - MusicPatchNode2 var39; - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2903 != null) { - for (var29 = 1; var29 < var39.field2903.length; var29 += 2) { - var39.field2903[var29] = var2.readByte(); + MusicPatchNode2 var41; + for (var27 = 0; var27 < var12; ++var27) { // L: 164 + var41 = var39[var27]; // L: 165 + if (var41.field2916 != null) { // L: 166 + for (var29 = 1; var29 < var41.field2916.length; var29 += 2) { // L: 167 + var41.field2916[var29] = var2.readByte(); } } - if (var39.field2901 != null) { - for (var29 = 3; var29 < var39.field2901.length - 2; var29 += 2) { - var39.field2901[var29] = var2.readByte(); + if (var41.field2914 != null) { // L: 169 + for (var29 = 3; var29 < var41.field2914.length - 2; var29 += 2) { // L: 170 + var41.field2914[var29] = var2.readByte(); } } } - if (var42 != null) { - for (var27 = 1; var27 < var42.length; var27 += 2) { - var42[var27] = var2.readByte(); + if (var44 != null) { // L: 173 + for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174 + var44[var27] = var2.readByte(); } } - if (var16 != null) { - for (var27 = 1; var27 < var16.length; var27 += 2) { + if (var16 != null) { // L: 176 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2901 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 179 + var41 = var39[var27]; // L: 180 + if (var41.field2914 != null) { // L: 181 + var19 = 0; // L: 182 - for (var29 = 2; var29 < var39.field2901.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var39.field2901[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field2914.length; var29 += 2) { // L: 183 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 + var41.field2914[var29] = (byte)var19; // L: 185 } } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2903 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 189 + var41 = var39[var27]; // L: 190 + if (var41.field2916 != null) { // L: 191 + var19 = 0; // L: 192 - for (var29 = 2; var29 < var39.field2903.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var39.field2903[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field2916.length; var29 += 2) { // L: 193 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 194 + var41.field2916[var29] = (byte)var19; // L: 195 } } } @@ -333,196 +335,372 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var45; - byte var47; - if (var42 != null) { - var19 = var2.readUnsignedByte(); - var42[0] = (byte)var19; + int var35; + int var36; + int var47; + byte var49; + if (var44 != null) { // L: 199 + var19 = var2.readUnsignedByte(); // L: 200 + var44[0] = (byte)var19; // L: 201 - for (var27 = 2; var27 < var42.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var42[var27] = (byte)var19; + for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 203 + var44[var27] = (byte)var19; // L: 204 } - var47 = var42[0]; - byte var28 = var42[1]; + var49 = var44[0]; // L: 206 + byte var28 = var44[1]; // L: 207 - for (var29 = 0; var29 < var47; ++var29) { - this.field2966[var29] = (byte)(var28 * this.field2966[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { // L: 208 + this.field2974[var29] = (byte)(var28 * this.field2974[var29] + 32 >> 6); } - for (var29 = 2; var29 < var42.length; var29 += 2) { - var30 = var42[var29]; - byte var31 = var42[var29 + 1]; - var32 = var28 * (var30 - var47) + (var30 - var47) / 2; + for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227 + var30 = var44[var29]; // L: 211 + byte var31 = var44[var29 + 1]; // L: 212 + var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213 - for (var33 = var47; var33 < var30; ++var33) { - var34 = MenuAction.method1885(var32, var30 - var47); - this.field2966[var33] = (byte)(var34 * this.field2966[var33] + 32 >> 6); - var32 += var31 - var28; + for (var33 = var49; var33 < var30; ++var33) { // L: 214 + var35 = var30 - var49; // L: 216 + var36 = var32 >>> 31; // L: 218 + var34 = (var32 + var36) / var35 - var36; // L: 219 + this.field2974[var33] = (byte)(var34 * this.field2974[var33] + 32 >> 6); // L: 222 + var32 += var31 - var28; // L: 223 } - var47 = var30; - var28 = var31; + var49 = var30; // L: 225 + var28 = var31; // L: 226 } - for (var45 = var47; var45 < 128; ++var45) { - this.field2966[var45] = (byte)(var28 * this.field2966[var45] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { // L: 229 + this.field2974[var47] = (byte)(var28 * this.field2974[var47] + 32 >> 6); } - var15 = null; + var15 = null; // L: 230 } - if (var16 != null) { - var19 = var2.readUnsignedByte(); - var16[0] = (byte)var19; + if (var16 != null) { // L: 232 + var19 = var2.readUnsignedByte(); // L: 233 + var16[0] = (byte)var19; // L: 234 - for (var27 = 2; var27 < var16.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var16[var27] = (byte)var19; + for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236 + var16[var27] = (byte)var19; // L: 237 } - var47 = var16[0]; - int var44 = var16[1] << 1; + var49 = var16[0]; // L: 239 + int var46 = var16[1] << 1; // L: 240 - for (var29 = 0; var29 < var47; ++var29) { - var45 = var44 + (this.field2970[var29] & 255); - if (var45 < 0) { - var45 = 0; + for (var29 = 0; var29 < var49; ++var29) { // L: 241 + var47 = var46 + (this.field2971[var29] & 255); // L: 242 + if (var47 < 0) { // L: 243 + var47 = 0; } - if (var45 > 128) { - var45 = 128; + if (var47 > 128) { // L: 244 + var47 = 128; } - this.field2970[var29] = (byte)var45; + this.field2971[var29] = (byte)var47; // L: 245 } - int var46; - for (var29 = 2; var29 < var16.length; var29 += 2) { - var30 = var16[var29]; - var46 = var16[var29 + 1] << 1; - var32 = var44 * (var30 - var47) + (var30 - var47) / 2; + int var48; + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268 + var30 = var16[var29]; // L: 249 + var48 = var16[var29 + 1] << 1; // L: 250 + var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251 - for (var33 = var47; var33 < var30; ++var33) { - var34 = MenuAction.method1885(var32, var30 - var47); - int var35 = var34 + (this.field2970[var33] & 255); - if (var35 < 0) { - var35 = 0; + for (var33 = var49; var33 < var30; ++var33) { // L: 252 + var35 = var30 - var49; // L: 254 + var36 = var32 >>> 31; // L: 256 + var34 = (var36 + var32) / var35 - var36; // L: 257 + int var37 = var34 + (this.field2971[var33] & 255); // L: 260 + if (var37 < 0) { // L: 261 + var37 = 0; } - if (var35 > 128) { - var35 = 128; + if (var37 > 128) { // L: 262 + var37 = 128; } - this.field2970[var33] = (byte)var35; - var32 += var46 - var44; + this.field2971[var33] = (byte)var37; // L: 263 + var32 += var48 - var46; // L: 264 } - var47 = var30; - var44 = var46; + var49 = var30; // L: 266 + var46 = var48; // L: 267 } - for (var45 = var47; var45 < 128; ++var45) { - var46 = var44 + (this.field2970[var45] & 255); - if (var46 < 0) { - var46 = 0; + for (var47 = var49; var47 < 128; ++var47) { // L: 270 + var48 = var46 + (this.field2971[var47] & 255); // L: 271 + if (var48 < 0) { // L: 272 + var48 = 0; } - if (var46 > 128) { - var46 = 128; + if (var48 > 128) { // L: 273 + var48 = 128; } - this.field2970[var45] = (byte)var46; + this.field2971[var47] = (byte)var48; // L: 274 } - Object var43 = null; + Object var45 = null; // L: 276 } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2902 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 278 + var39[var27].field2913 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2903 != null) { - var39.field2900 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 279 + var41 = var39[var27]; // L: 280 + if (var41.field2916 != null) { // L: 281 + var41.field2918 = var2.readUnsignedByte(); } - if (var39.field2901 != null) { - var39.field2904 = var2.readUnsignedByte(); + if (var41.field2914 != null) { // L: 282 + var41.field2915 = var2.readUnsignedByte(); } - if (var39.field2902 > 0) { - var39.field2905 = var2.readUnsignedByte(); + if (var41.field2913 > 0) { // L: 283 + var41.field2912 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2907 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 285 + var39[var27].field2911 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2907 > 0) { - var39.field2906 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 286 + var41 = var39[var27]; // L: 287 + if (var41.field2911 > 0) { // L: 288 + var41.field2917 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2906 > 0) { - var39.field2908 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 290 + var41 = var39[var27]; // L: 291 + if (var41.field2917 > 0) { // L: 292 + var41.field2919 = var2.readUnsignedByte(); } } - } + } // L: 294 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lat;[B[II)Z", - garbageValue = "52937622" + descriptor = "(Lad;[B[II)Z", + garbageValue = "-1514106503" ) - boolean method4875(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; - int var5 = 0; - RawSound var6 = null; + boolean method4945(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 297 + int var5 = 0; // L: 298 + RawSound var6 = null; // L: 299 - for (int var7 = 0; var7 < 128; ++var7) { - if (var2 == null || var2[var7] != 0) { - int var8 = this.field2967[var7]; - if (var8 != 0) { - if (var5 != var8) { - var5 = var8--; - if ((var8 & 1) == 0) { + for (int var7 = 0; var7 < 128; ++var7) { // L: 300 + if (var2 == null || var2[var7] != 0) { // L: 301 + int var8 = this.field2975[var7]; // L: 302 + if (var8 != 0) { // L: 303 + if (var5 != var8) { // L: 304 + var5 = var8--; // L: 305 306 + if ((var8 & 1) == 0) { // L: 307 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308 } - if (var6 == null) { + if (var6 == null) { // L: 309 var4 = false; } } - if (var6 != null) { - this.rawSounds[var7] = var6; - this.field2967[var7] = 0; + if (var6 != null) { // L: 311 + this.rawSounds[var7] = var6; // L: 312 + this.field2975[var7] = 0; // L: 313 } } } } - return var4; + return var4; // L: 317 } - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "24574" + descriptor = "(I)V", + garbageValue = "1852268477" ) @Export("clear") void clear() { - this.field2967 = null; + this.field2975 = null; // L: 321 + } // L: 322 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "302724189" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class21.World_request == null) { // L: 31 + class21.World_request = class320.urlRequester.request(new URL(BoundaryObject.field2618)); + } else if (class21.World_request.isDone()) { // L: 33 + byte[] var0 = class21.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + WorldMapEvent.World_worlds = new World[World.World_count]; // L: 38 + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = WorldMapEvent.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); // L: 43 + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + ObjectSound.sortWorlds(WorldMapEvent.World_worlds, 0, WorldMapEvent.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + class21.World_request = null; + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + class21.World_request = null; // L: 57 + } + + return false; // L: 59 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "38" + ) + public static int method4949(int var0, int var1, int var2) { + int var3 = class123.method2619(var2 - var1 + 1); // L: 48 + var3 <<= var1; // L: 49 + return var0 & ~var3; // L: 50 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILbp;ZB)I", + garbageValue = "-51" + ) + static int method4950(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1018 + var0 -= 1000; // L: 1019 + var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1020 + } else { + var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1022 + } + + String var4 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1023 + int[] var5 = null; // L: 1024 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1025 + int var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1026 + if (var6 > 0) { // L: 1027 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]) { // L: 1028 1029 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1031 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1033 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1034 + if (var4.charAt(var7 - 1) == 's') { // L: 1035 + var8[var7] = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1036 + } + } + + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1038 + if (var7 != -1) { // L: 1039 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1040 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1041 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1042 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1043 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1044 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1045 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1046 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1047 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1048 + var3.onVarTransmit = var8; // L: 1049 + var3.varTransmitTriggers = var5; // L: 1050 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1052 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1053 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1054 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1055 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1056 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1057 + var3.onInvTransmit = var8; // L: 1058 + var3.invTransmitTriggers = var5; // L: 1059 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1061 + var3.onStatTransmit = var8; // L: 1062 + var3.statTransmitTriggers = var5; // L: 1063 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1065 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1066 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1067 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1068 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1069 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1070 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1071 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1072 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1073 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1074 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1075 + var3.field3172 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1076 + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1077 + var3.field3056 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1078 + var3.field3166 = var8; + } else if (var0 == 1430) { + var3.field3161 = var8; // L: 1079 + } else { + if (var0 != 1431) { // L: 1080 + return 2; // L: 1081 + } + + var3.field3162 = var8; + } + + var3.hasListener = true; // L: 1082 + return 1; // L: 1083 } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index ca5575942d..ec5289ed19 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,141 +4,130 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("iu") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 594812203 + intValue = -765367779 ) - int field2980; - @ObfuscatedName("q") + int field2996; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lif;" + ) + MusicPatchNode2 field2988; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Liy;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Laz;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - MusicPatchNode2 field2981; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 481741389 - ) - int field2985; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1319618045 - ) - int field2988; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 754199743 - ) - int field2984; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -986353547 - ) - int field2982; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1048231541 - ) - int field2986; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -40565163 - ) - int field2987; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1800306941 - ) - int field2983; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1955629255 + intValue = -1956432115 ) int field2989; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 20741255 + intValue = -25523701 ) int field2990; - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 723943993 + intValue = -1073862623 ) int field2991; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 804975845 + intValue = 483864743 ) - int field2978; - @ObfuscatedName("c") + int field2992; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1338086521 + intValue = -1449376121 ) int field2993; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1413692333 + intValue = 154374579 ) - int field2994; + int field2997; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 306416011 + intValue = 875004827 ) - int field2995; - @ObfuscatedName("p") + int field2998; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -282874889 + ) + int field2986; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1795067685 + ) + int field3004; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1488194149 + ) + int field2994; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 546562593 + ) + int field2999; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -95307761 + ) + int field3000; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -828280659 + ) + int field3001; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -604585329 + ) + int field3002; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lax;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -367314443 + intValue = 630031751 ) - int field2997; - @ObfuscatedName("o") + int field2995; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1969010689 + intValue = -848603207 ) - int field2998; + int field3003; MusicPatchNode() { - } + } // L: 31 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1742353306" + descriptor = "(B)V", + garbageValue = "0" ) - void method4913() { - this.patch = null; - this.rawSound = null; - this.field2981 = null; - this.stream = null; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1553277832" - ) - static final void method4912() { - Object var10000 = null; - String var0 = "You can't add yourself to your own friend list"; - GraphicsDefaults.addGameMessage(30, "", var0); - } + void method4992() { + this.patch = null; // L: 34 + this.rawSound = null; // L: 35 + this.field2988 = null; // L: 36 + this.stream = null; // L: 37 + } // L: 38 } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index c9e8ee3508..403a994ebb 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -4,55 +4,355 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("if") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("qu") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("l") - byte[] field2903; - @ObfuscatedName("q") - byte[] field2901; - @ObfuscatedName("f") + @ObfuscatedName("i") + byte[] field2916; + @ObfuscatedName("w") + byte[] field2914; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -105556407 + intValue = 1643718021 ) - int field2902; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1269066503 - ) - int field2900; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1246487845 - ) - int field2904; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -491530791 - ) - int field2905; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1598765927 - ) - int field2906; + int field2913; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -312422877 + intValue = 470925631 ) - int field2907; + int field2918; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1577880969 + ) + int field2915; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1887609341 + ) + int field2912; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2091086913 + intValue = 1787645677 ) - int field2908; + int field2917; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -311548265 + ) + int field2911; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1107256975 + ) + int field2919; MusicPatchNode2() { + } // L: 14 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "2086723943" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? GrandExchangeEvent.method5448(var0, 10, var1) : Integer.toString(var0); // L: 114 115 } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-1147573372" + ) + @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: 7519 + if (Client.isLowDetail && var0 != GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 7520 + return; + } + + long var7 = 0L; // L: 7521 + boolean var9 = true; // L: 7522 + boolean var10 = false; // L: 7523 + boolean var11 = false; // L: 7524 + if (var1 == 0) { // L: 7525 + var7 = GameBuild.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7526 + var7 = GameBuild.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7527 + var7 = GameBuild.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7528 + var7 = GameBuild.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { // L: 7529 + var12 = GameBuild.scene.getObjectFlags(var0, var2, var3, var7); // L: 7530 + int var38 = class21.Entity_unpackID(var7); // L: 7531 + int var39 = var12 & 31; // L: 7532 + int var40 = var12 >> 6 & 3; // L: 7533 + ObjectComposition var13; + if (var1 == 0) { // L: 7534 + GameBuild.scene.removeBoundaryObject(var0, var2, var3); // L: 7535 + var13 = KitDefinition.getObjectDefinition(var38); // L: 7536 + if (var13.interactType != 0) { // L: 7537 + Client.collisionMaps[var0].method3470(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7539 + GameBuild.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7540 + GameBuild.scene.removeGameObject(var0, var2, var3); // L: 7541 + var13 = KitDefinition.getObjectDefinition(var38); // L: 7542 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7543 + return; + } + + if (var13.interactType != 0) { // L: 7544 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7546 + GameBuild.scene.removeFloorDecoration(var0, var2, var3); // L: 7547 + var13 = KitDefinition.getObjectDefinition(var38); // L: 7548 + if (var13.interactType == 1) { // L: 7549 + Client.collisionMaps[var0].method3479(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7552 + var12 = var0; // L: 7553 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7554 + var12 = var0 + 1; + } + + Scene var41 = GameBuild.scene; // L: 7555 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7556 + ObjectComposition var15 = KitDefinition.getObjectDefinition(var4); // L: 7558 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7561 + var16 = var15.sizeX; // L: 7566 + var17 = var15.sizeY; // L: 7567 + } else { + var16 = var15.sizeY; // L: 7562 + var17 = var15.sizeX; // L: 7563 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7573 + var18 = (var16 >> 1) + var2; // L: 7574 + var19 = var2 + (var16 + 1 >> 1); // L: 7575 + } else { + var18 = var2; // L: 7578 + var19 = var2 + 1; // L: 7579 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7581 + var20 = var3 + (var17 >> 1); // L: 7582 + var21 = var3 + (var17 + 1 >> 1); // L: 7583 + } else { + var20 = var3; // L: 7586 + var21 = var3 + 1; // L: 7587 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7589 + int var23 = var22[var19][var21] + var22[var18][var20] + var22[var19][var20] + var22[var18][var21] >> 2; // L: 7590 + int var24 = (var2 << 7) + (var16 << 6); // L: 7591 + int var25 = (var3 << 7) + (var17 << 6); // L: 7592 + long var26 = PacketBuffer.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7593 + int var28 = (var5 << 6) + var6; // L: 7594 + if (var15.int3 == 1) { // L: 7595 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7596 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7598 + 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: 7599 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7600 + if (var15.interactType == 1) { // L: 7601 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7604 + if (var6 >= 12) { // L: 7612 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7614 + 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: 7615 + } + + var41.method4289(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7616 + if (var15.interactType != 0) { // L: 7617 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7620 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7622 + 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: 7623 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field964[var5], 0, var26, var28); // L: 7624 + if (var15.interactType != 0) { // L: 7625 + var14.method3465(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7628 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7630 + 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: 7631 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field967[var5], 0, var26, var28); // L: 7632 + if (var15.interactType != 0) { // L: 7633 + var14.method3465(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7636 + var29 = var5 + 1 & 3; // L: 7637 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7640 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7641 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7642 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7645 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7646 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field964[var5], Tiles.field964[var29], var26, var28); // L: 7648 + if (var15.interactType != 0) { // L: 7649 + var14.method3465(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7652 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7654 + 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: 7655 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field967[var5], 0, var26, var28); // L: 7656 + if (var15.interactType != 0) { // L: 7657 + var14.method3465(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7660 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7662 + 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: 7663 + } + + var41.method4289(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7664 + if (var15.interactType != 0) { // L: 7665 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7668 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7670 + 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: 7671 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field964[var5], 0, 0, 0, var26, var28); // L: 7672 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7675 + var29 = 16; // L: 7676 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7677 + if (0L != var30) { // L: 7678 + var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7680 + 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: 7681 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field964[var5], 0, var29 * Tiles.field966[var5], var29 * Tiles.field960[var5], var26, var28); // L: 7682 + } else if (var6 == 6) { // L: 7685 + var29 = 8; // L: 7686 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7687 + if (0L != var30) { // L: 7688 + var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7690 + 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: 7691 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field957[var5], var29 * Tiles.field970[var5], var26, var28); // L: 7692 + } else if (var6 == 7) { // L: 7695 + int var35 = var5 + 2 & 3; // L: 7697 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7698 + 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: 7699 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7700 + } else if (var6 == 8) { // L: 7703 + var29 = 8; // L: 7704 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7705 + if (var30 != 0L) { // L: 7706 + var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7709 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7710 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7711 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7712 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7715 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7716 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field957[var5], var29 * Tiles.field970[var5], var26, var28); // L: 7718 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7606 + 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: 7607 + } + + if (var36 != null) { // L: 7608 + var41.method4289(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7609 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } + } + } + + } // L: 7723 } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index f0fd90dea5..bfe20b0070 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -3,131 +3,131 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("ij") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lio;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "Las;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lig;)V" + descriptor = "(Lio;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { - this.queue = new NodeDeque(); - this.mixer = new PcmStreamMixer(); - this.superStream = var1; - } + this.queue = new NodeDeque(); // L: 11 + this.mixer = new PcmStreamMixer(); // L: 12 + this.superStream = var1; // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lib;[IIIII)V", - garbageValue = "-1501079312" + descriptor = "(Liu;[IIIII)V", + garbageValue = "-887110953" ) - void method4890(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2948[var1.field2980] & 4) != 0 && var1.field2978 < 0) { - int var6 = this.superStream.field2939[var1.field2980] / PcmPlayer.field279; + void method4974(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2944[var1.field2996] & 4) != 0 && var1.field2999 < 0) { // L: 73 + int var6 = this.superStream.field2946[var1.field2996] / UserComparator2.field4359; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field2998) / var6; - if (var7 > var4) { - var1.field2998 += var6 * var4; + int var7 = (var6 + 1048575 - var1.field3003) / var6; // L: 76 + if (var7 > var4) { // L: 77 + var1.field3003 += var6 * var4; // L: 99 break; } - var1.stream.fill(var2, var3, var7); - var3 += var7; - var4 -= var7; - var1.field2998 += var6 * var7 - 1048576; - int var8 = PcmPlayer.field279 / 100; - int var9 = 262144 / var6; - if (var9 < var8) { + var1.stream.fill(var2, var3, var7); // L: 78 + var3 += var7; // L: 79 + var4 -= var7; // L: 80 + var1.field3003 += var6 * var7 - 1048576; // L: 81 + int var8 = UserComparator2.field4359 / 100; // L: 82 + int var9 = 262144 / var6; // L: 83 + if (var9 < var8) { // L: 84 var8 = var9; } - RawPcmStream var10 = var1.stream; - if (this.superStream.field2937[var1.field2980] == 0) { - var1.stream = RawPcmStream.method794(var1.rawSound, var10.method797(), var10.method852(), var10.method801()); + RawPcmStream var10 = var1.stream; // L: 85 + if (this.superStream.field2932[var1.field2996] == 0) { // L: 86 + var1.stream = RawPcmStream.method817(var1.rawSound, var10.method832(), var10.method936(), var10.method824()); // L: 87 } else { - var1.stream = RawPcmStream.method794(var1.rawSound, var10.method797(), 0, var10.method801()); - this.superStream.method4802(var1, var1.patch.field2965[var1.field2988] < 0); - var1.stream.method805(var8, var10.method852()); + var1.stream = RawPcmStream.method817(var1.rawSound, var10.method832(), 0, var10.method824()); // L: 90 + this.superStream.method4765(var1, var1.patch.field2972[var1.field2990] < 0); // L: 91 + var1.stream.method941(var8, var10.method936()); // L: 92 } - if (var1.patch.field2965[var1.field2988] < 0) { + if (var1.patch.field2972[var1.field2990] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method807(var8); - var10.fill(var2, var3, var5 - var3); - if (var10.method920()) { + var10.method830(var8); // L: 95 + var10.fill(var2, var3, var5 - var3); // L: 96 + if (var10.method834()) { // L: 97 this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); - } + var1.stream.fill(var2, var3, var4); // L: 101 + } // L: 102 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lib;IB)V", - garbageValue = "32" + descriptor = "(Liu;IB)V", + garbageValue = "50" ) - void method4891(MusicPatchNode var1, int var2) { - if ((this.superStream.field2948[var1.field2980] & 4) != 0 && var1.field2978 < 0) { - int var3 = this.superStream.field2939[var1.field2980] / PcmPlayer.field279; - int var4 = (var3 + 1048575 - var1.field2998) / var3; - var1.field2998 = var3 * var2 + var1.field2998 & 1048575; - if (var4 <= var2) { - if (this.superStream.field2937[var1.field2980] == 0) { - var1.stream = RawPcmStream.method794(var1.rawSound, var1.stream.method797(), var1.stream.method852(), var1.stream.method801()); + void method4959(MusicPatchNode var1, int var2) { + if ((this.superStream.field2944[var1.field2996] & 4) != 0 && var1.field2999 < 0) { // L: 105 + int var3 = this.superStream.field2946[var1.field2996] / UserComparator2.field4359; // L: 106 + int var4 = (var3 + 1048575 - var1.field3003) / var3; // L: 107 + var1.field3003 = var3 * var2 + var1.field3003 & 1048575; // L: 108 + if (var4 <= var2) { // L: 109 + if (this.superStream.field2932[var1.field2996] == 0) { // L: 110 + var1.stream = RawPcmStream.method817(var1.rawSound, var1.stream.method832(), var1.stream.method936(), var1.stream.method824()); // L: 111 } else { - var1.stream = RawPcmStream.method794(var1.rawSound, var1.stream.method797(), 0, var1.stream.method801()); - this.superStream.method4802(var1, var1.patch.field2965[var1.field2988] < 0); + var1.stream = RawPcmStream.method817(var1.rawSound, var1.stream.method832(), 0, var1.stream.method824()); // L: 114 + this.superStream.method4765(var1, var1.patch.field2972[var1.field2990] < 0); // L: 115 } - if (var1.patch.field2965[var1.field2988] < 0) { + if (var1.patch.field2972[var1.field2990] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field2998 / var3; + var2 = var1.field3003 / var3; // L: 118 } } - var1.stream.skip(var2); - } + var1.stream.skip(var2); // L: 121 + } // L: 122 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 if (var1 == null) { - return null; + return null; // L: 20 } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "()Lav;" ) @@ -135,159 +135,67 @@ public class MusicPatchPcmStream extends PcmStream { protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); + var1 = (MusicPatchNode)this.queue.previous(); // L: 27 if (var1 == null) { - return null; + return null; // L: 28 } - } while(var1.stream == null); + } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("a") - protected int vmethod4889() { - return 0; + @ObfuscatedName("p") + protected int vmethod4958() { + return 0; // L: 34 } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("fill") protected void fill(int[] var1, int var2, int var3) { - this.mixer.fill(var1, var2, var3); + this.mixer.fill(var1, var2, var3); // L: 40 - for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method4797(var6)) { - int var4 = var2; - int var5 = var3; + for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 + if (!this.superStream.method4787(var6)) { // L: 42 + int var4 = var2; // L: 43 + int var5 = var3; // L: 44 do { - if (var5 <= var6.field2997) { - this.method4890(var6, var1, var4, var5, var4 + var5); - var6.field2997 -= var5; + if (var5 <= var6.field2995) { // L: 45 + this.method4974(var6, var1, var4, var5, var5 + var4); // L: 51 + var6.field2995 -= var5; // L: 52 break; } - this.method4890(var6, var1, var4, var6.field2997, var5 + var4); - var4 += var6.field2997; - var5 -= var6.field2997; - } while(!this.superStream.method4739(var6, var1, var4, var5)); + this.method4974(var6, var1, var4, var6.field2995, var5 + var4); // L: 46 + var4 += var6.field2995; // L: 47 + var5 -= var6.field2995; // L: 48 + } while(!this.superStream.method4788(var6, var1, var4, var5)); // L: 49 } } - } + } // L: 54 - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("skip") protected void skip(int var1) { - this.mixer.skip(var1); + this.mixer.skip(var1); // L: 58 - for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method4797(var3)) { - int var2 = var1; + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 + if (!this.superStream.method4787(var3)) { // L: 60 + int var2 = var1; // L: 61 do { - if (var2 <= var3.field2997) { - this.method4891(var3, var2); - var3.field2997 -= var2; + if (var2 <= var3.field2995) { // L: 62 + this.method4959(var3, var2); // L: 67 + var3.field2995 -= var2; // L: 68 break; } - this.method4891(var3, var3.field2997); - var2 -= var3.field2997; - } while(!this.superStream.method4739(var3, (int[])null, 0, var2)); + this.method4959(var3, var3.field2995); // L: 63 + var2 -= var3.field2995; // L: 64 + } while(!this.superStream.method4788(var3, (int[])null, 0, var2)); // L: 65 } } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkn;S)I", - garbageValue = "7731" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - char var7 = 0; - char var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - var7 = class17.method244(var9); - var8 = class17.method244(var10); - var9 = TileItem.standardizeChar(var9, var2); - var10 = TileItem.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var10 != var9) { - return UserComparator4.lowercaseChar(var9, var2) - UserComparator4.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - char var12; - int var17; - 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 var11 = var0.charAt(var5); - var12 = var1.charAt(var6); - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { - var11 = Character.toLowerCase(var11); - var12 = Character.toLowerCase(var12); - if (var11 != var12) { - return UserComparator4.lowercaseChar(var11, var2) - UserComparator4.lowercaseChar(var12, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var18 = 0; var18 < var16; ++var18) { - var12 = var0.charAt(var18); - char var13 = var1.charAt(var18); - if (var12 != var13) { - return UserComparator4.lowercaseChar(var12, var2) - UserComparator4.lowercaseChar(var13, var2); - } - } - - return 0; - } - } + } // L: 70 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 26df5503a2..8a077c1497 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("iv") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) MusicTrack(Buffer var1) { - 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; + 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 int var13; int var14; int var15; - for (var13 = 0; var13 < var2; ++var13) { - var14 = -1; + for (var13 = 0; var13 < var2; ++var13) { // L: 35 + var14 = -1; // L: 36 while (true) { - var15 = var1.readUnsignedByte(); - if (var15 != var14) { + var15 = var1.readUnsignedByte(); // L: 38 + if (var15 != var14) { // L: 39 ++var4; } - var14 = var15 & 15; - if (var15 == 7) { + var14 = var15 & 15; // L: 40 + if (var15 == 7) { // L: 41 break; } - 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; + 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 } else { - if (var14 != 6) { - throw new RuntimeException(); + if (var14 != 6) { // L: 70 + throw new RuntimeException(); // L: 74 } - ++var12; + ++var12; // L: 71 } } } - 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; + 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 - for (var15 = 0; var15 < var14; ++var15) { + for (var15 = 0; var15 < var14; ++var15) { // L: 82 var1.readVarInt(); } - 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; + 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 int var29; - for (var29 = 0; var29 < var6; ++var29) { - var28 = var28 + var1.readUnsignedByte() & 127; - if (var28 != 0 && var28 != 32) { - if (var28 == 1) { + 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 ++var16; - } else if (var28 == 33) { + } else if (var28 == 33) { // L: 102 ++var17; - } else if (var28 == 7) { + } else if (var28 == 7) { // L: 103 ++var18; - } else if (var28 == 39) { + } else if (var28 == 39) { // L: 104 ++var19; - } else if (var28 == 10) { + } else if (var28 == 10) { // L: 105 ++var20; - } else if (var28 == 42) { + } else if (var28 == 42) { // L: 106 ++var21; - } else if (var28 == 99) { + } else if (var28 == 99) { // L: 107 ++var22; - } else if (var28 == 98) { + } else if (var28 == 98) { // L: 108 ++var23; - } else if (var28 == 101) { + } else if (var28 == 101) { // L: 109 ++var24; - } else if (var28 == 100) { + } else if (var28 == 100) { // L: 110 ++var25; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { - ++var27; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 111 + ++var27; // L: 112 } else { ++var26; } @@ -135,153 +135,153 @@ public class MusicTrack extends Node { } } - 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; + 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 label243: - for (int var60 = 0; var60 < var2; ++var60) { - var51.writeInt(1297379947); - var51.offset += 4; - int var61 = var51.offset; - int var62 = -1; + 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 while (true) { while (true) { - int var63 = var1.readVarInt(); - var51.writeVarInt(var63); - int var64 = var1.array[var29++] & 255; - boolean var65 = var64 != var62; - var62 = var64 & 15; - if (var64 == 7) { - if (var65) { + 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 var51.writeByte(255); } - var51.writeByte(47); - var51.writeByte(0); - var51.writeLengthInt(var51.offset - var61); + var51.writeByte(47); // L: 187 + var51.writeByte(0); // L: 188 + var51.writeLengthInt(var51.offset - var61); // L: 269 continue label243; } - if (var64 == 23) { - if (var65) { + if (var64 == 23) { // L: 191 + if (var65) { // L: 192 var51.writeByte(255); } - var51.writeByte(81); - var51.writeByte(3); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); + 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 } else { - var52 ^= var64 >> 4; - if (var62 == 0) { - if (var65) { + var52 ^= var64 >> 4; // L: 200 + if (var62 == 0) { // L: 201 + if (var65) { // L: 202 var51.writeByte(var52 + 144); } - var53 += var1.array[var37++]; - var54 += var1.array[var38++]; - var51.writeByte(var53 & 127); - var51.writeByte(var54 & 127); - } else if (var62 == 1) { - if (var65) { + 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 var51.writeByte(var52 + 128); } - var53 += var1.array[var37++]; - var55 += var1.array[var40++]; - var51.writeByte(var53 & 127); - var51.writeByte(var55 & 127); - } else if (var62 == 2) { - if (var65) { + 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 var51.writeByte(var52 + 176); } - var28 = var28 + var1.array[var15++] & 127; - var51.writeByte(var28); + var28 = var28 + var1.array[var15++] & 127; // L: 219 + var51.writeByte(var28); // L: 220 byte var66; - if (var28 != 0 && var28 != 32) { - if (var28 == 1) { + if (var28 != 0 && var28 != 32) { // L: 222 + if (var28 == 1) { // L: 223 var66 = var1.array[var34++]; - } else if (var28 == 33) { + } else if (var28 == 33) { // L: 224 var66 = var1.array[var41++]; - } else if (var28 == 7) { + } else if (var28 == 7) { // L: 225 var66 = var1.array[var35++]; - } else if (var28 == 39) { + } else if (var28 == 39) { // L: 226 var66 = var1.array[var42++]; - } else if (var28 == 10) { + } else if (var28 == 10) { // L: 227 var66 = var1.array[var36++]; - } else if (var28 == 42) { + } else if (var28 == 42) { // L: 228 var66 = var1.array[var43++]; - } else if (var28 == 99) { + } else if (var28 == 99) { // L: 229 var66 = var1.array[var46++]; - } else if (var28 == 98) { + } else if (var28 == 98) { // L: 230 var66 = var1.array[var47++]; - } else if (var28 == 101) { + } else if (var28 == 101) { // L: 231 var66 = var1.array[var48++]; - } else if (var28 == 100) { + } else if (var28 == 100) { // L: 232 var66 = var1.array[var49++]; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { - var66 = var1.array[var39++]; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 233 + var66 = var1.array[var39++]; // L: 234 } else { var66 = var1.array[var30++]; } @@ -289,146 +289,146 @@ public class MusicTrack extends Node { var66 = var1.array[var44++]; } - int var67 = var66 + var59[var28]; - var59[var28] = var67; - var51.writeByte(var67 & 127); - } else if (var62 == 3) { - if (var65) { + 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 var51.writeByte(var52 + 224); } - var56 += var1.array[var45++]; - var56 += var1.array[var33++] << 7; - var51.writeByte(var56 & 127); - var51.writeByte(var56 >> 7 & 127); - } else if (var62 == 4) { - if (var65) { + 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 var51.writeByte(var52 + 208); } - var57 += var1.array[var32++]; - var51.writeByte(var57 & 127); - } else if (var62 == 5) { - if (var65) { + var57 += var1.array[var32++]; // L: 250 + var51.writeByte(var57 & 127); // L: 251 + } else if (var62 == 5) { // L: 254 + if (var65) { // L: 255 var51.writeByte(var52 + 160); } - var53 += var1.array[var37++]; - var58 += var1.array[var31++]; - var51.writeByte(var53 & 127); - var51.writeByte(var58 & 127); + var53 += var1.array[var37++]; // L: 256 + var58 += var1.array[var31++]; // L: 257 + var51.writeByte(var53 & 127); // L: 258 + var51.writeByte(var58 & 127); // L: 259 } else { - if (var62 != 6) { - throw new RuntimeException(); + if (var62 != 6) { // L: 262 + throw new RuntimeException(); // L: 267 } - if (var65) { + if (var65) { // L: 263 var51.writeByte(var52 + 192); } - var51.writeByte(var1.array[var44++]); + var51.writeByte(var1.array[var44++]); // L: 264 } } } } } - } + } // L: 271 - @ObfuscatedName("q") - void method4904() { - 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(); + @ObfuscatedName("w") + void method4981() { + 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 int var6; - for (var6 = 0; var6 < var5; ++var6) { - var4.gotoTrack(var6); - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + for (var6 = 0; var6 < var5; ++var6) { // L: 283 + var4.gotoTrack(var6); // L: 284 + var4.readTrackLength(var6); // L: 285 + var4.markTrackPosition(var6); // L: 286 } label56: do { while (true) { - var6 = var4.getPrioritizedTrack(); - int var7 = var4.trackLengths[var6]; + var6 = var4.getPrioritizedTrack(); // L: 289 + int var7 = var4.trackLengths[var6]; // L: 290 - while (var7 == var4.trackLengths[var6]) { - var4.gotoTrack(var6); - int var8 = var4.readMessage(var6); - if (var8 == 1) { - var4.setTrackDone(); - var4.markTrackPosition(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 continue label56; } - int var9 = var8 & 240; + int var9 = var8 & 240; // L: 300 int var10; int var11; int var12; - if (var9 == 176) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if (var11 == 0) { + 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 var1[var10] = (var12 << 14) + (var1[var10] & -2080769); } - if (var11 == 32) { + if (var11 == 32) { // L: 306 var1[var10] = (var1[var10] & -16257) + (var12 << 7); } } - if (var9 == 192) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var2[var10] = var11 + var1[var10]; + 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 == 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); + 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 } - var14.byteArray[var11] = 1; + var14.byteArray[var11] = 1; // L: 324 } } - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + var4.readTrackLength(var6); // L: 327 + var4.markTrackPosition(var6); // L: 328 } } - } while(!var4.isDone()); + } while(!var4.isDone()); // L: 297 } - } + } // L: 331 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("clear") void clear() { - this.table = null; - } + this.table = null; // L: 334 + } // L: 335 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;II)Lim;" + descriptor = "(Lko;II)Liv;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new MusicTrack(new Buffer(var3)); + byte[] var3 = var0.takeFile(var1, var2); // L: 16 + return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index cd6bc422a3..e5c6cdac74 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -3,75 +3,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cp") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("l") + @ObfuscatedName("pr") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lmd;" + ) + static class353 field1210; + @ObfuscatedName("n") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + @ObfuscatedName("ol") + @ObfuscatedSignature( + descriptor = "[Ljf;" + ) + static Widget[] field1207; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lfw;" ) @Export("definition") NPCComposition definition; NPC() { - } + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IBB)V", - garbageValue = "20" + descriptor = "(IBI)V", + garbageValue = "-1295452505" ) - final void method2223(int var1, byte var2) { - int var3 = super.pathX[0]; - int var4 = super.pathY[0]; - if (var1 == 0) { - --var3; + final void method2258(int var1, byte 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 ++var4; } - if (var1 == 1) { - ++var4; + if (var1 == 2) { // L: 22 + ++var3; // L: 23 + ++var4; // L: 24 } - if (var1 == 2) { - ++var3; - ++var4; - } - - if (var1 == 3) { + if (var1 == 3) { // L: 26 --var3; } - if (var1 == 4) { + if (var1 == 4) { // L: 27 ++var3; } - if (var1 == 5) { - --var3; + if (var1 == 5) { // L: 28 + --var3; // L: 29 + --var4; // L: 30 + } + + if (var1 == 6) { // L: 32 --var4; } - if (var1 == 6) { - --var4; + if (var1 == 7) { // L: 33 + ++var3; // L: 34 + --var4; // L: 35 } - if (var1 == 7) { - ++var3; - --var4; - } - - if (super.sequence != -1 && KitDefinition.SequenceDefinition_get(super.sequence).field1960 == 1) { + if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 37 super.sequence = -1; } - if (super.pathLength < 9) { + if (super.pathLength < 9) { // L: 38 ++super.pathLength; } - for (int var5 = super.pathLength; var5 > 0; --var5) { - super.pathX[var5] = super.pathX[var5 - 1]; - super.pathY[var5] = super.pathY[var5 - 1]; - super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; + for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 + super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 + super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 + super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 } super.pathX[0] = var3; @@ -79,156 +92,151 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected final Model getModel() { - if (this.definition == null) { + if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? KitDefinition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : KitDefinition.SequenceDefinition_get(super.movementSequence); - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? MouseHandler.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : MouseHandler.SequenceDefinition_get(super.movementSequence); // L: 79 + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 + if (var3 == null) { // L: 81 return null; } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = class21.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.field1147, 0); - Model[] var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + var3.calculateBoundsCylinder(); // L: 82 + super.defaultHeight = var3.height; // L: 83 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 + Model var4 = BZip2State.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + if (var4 != null) { // L: 86 + var4.offsetBy(0, -super.field1126, 0); // L: 87 + Model[] var5 = new Model[]{var3, var4}; // L: 88 + var3 = new Model(var5, 2); // L: 89 } } - if (this.definition.size == 1) { + if (this.definition.size == 1) { // L: 92 var3.isSingleTile = true; } - return var3; + return var3; // L: 93 } } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIZB)V", - garbageValue = "97" + garbageValue = "-124" ) - final void method2234(int var1, int var2, boolean var3) { - if (super.sequence != -1 && KitDefinition.SequenceDefinition_get(super.sequence).field1960 == 1) { + final void method2249(int var1, int var2, boolean var3) { + if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 50 super.sequence = -1; } - 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) { + 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 ++super.pathLength; } - for (int var6 = super.pathLength; var6 > 0; --var6) { - super.pathX[var6] = super.pathX[var6 - 1]; + for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56 + super.pathX[var6] = super.pathX[var6 - 1]; // L: 57 super.pathY[var6] = super.pathY[var6 - 1]; super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; } - super.pathX[0] = var1; + super.pathX[0] = var1; // L: 61 super.pathY[0] = var2; - super.pathTraversed[0] = 1; - return; + super.pathTraversed[0] = 1; // L: 63 + return; // L: 64 } } - super.pathLength = 0; - super.field1129 = 0; - super.field1164 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - super.x = super.pathX[0] * 128 + super.field1109 * 64; - super.y = super.field1109 * 64 + super.pathY[0] * 128; - } + super.pathLength = 0; // L: 67 + super.field1144 = 0; // L: 68 + super.field1085 = 0; // L: 69 + super.pathX[0] = var1; // L: 70 + super.pathY[0] = var2; // L: 71 + super.x = super.pathX[0] * 128 + super.field1087 * 64; // L: 72 + super.y = super.pathY[0] * 128 + super.field1087 * 64; // L: 73 + } // L: 74 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1841514183" + garbageValue = "-532391824" ) @Export("isVisible") final boolean isVisible() { - return this.definition != null; + return this.definition != null; // L: 97 } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-3271" + descriptor = "(Lnf;III)I", + garbageValue = "2110206967" ) - static final int method2232() { - return ViewportMouse.ViewportMouse_x; + static int method2251(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; + } } - @ObfuscatedName("x") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-57" + descriptor = "(I)V", + garbageValue = "569144046" ) - static void method2233() { - class112.method2474(24); - class17.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + public static void method2248() { + if (MouseHandler.MouseHandler_instance != null) { // L: 44 + synchronized(MouseHandler.MouseHandler_instance) { // L: 45 + MouseHandler.MouseHandler_instance = null; // L: 46 + } // L: 47 + } + + } // L: 49 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1285705264" + ) + static final boolean method2265(int var0, int var1) { + ObjectComposition var2 = KitDefinition.getObjectDefinition(var0); // L: 601 + if (var1 == 11) { // L: 602 + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; // L: 603 + } + + return var2.method3305(var1); // L: 604 } - @ObfuscatedName("ex") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-7381" + descriptor = "([BIS)I", + garbageValue = "-944" ) - static void method2235() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1281 = null; - Client.packetWriter.field1293 = null; - Client.packetWriter.field1288 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1290 = 0; - Client.rebootTimer = 0; - class7.method46(); - Client.minimapState = 0; - Client.destinationX = 0; + public static int method2256(byte[] var0, int var1) { + int var3 = -1; // L: 58 - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; + for (int var4 = 0; var4 < var1; ++var4) { // L: 59 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 60 } - class67.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - UserList.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field710[var0] = true; - } - - PacketBufferNode var2 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class12.getWindowedMode()); - var2.packetBuffer.writeShort(Huffman.canvasWidth); - var2.packetBuffer.writeShort(MouseRecorder.canvasHeight); - Client.packetWriter.addNode(var2); + var3 = ~var3; // L: 62 + return var3; // L: 65 } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 9dff0cdf5d..75492b37c5 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -4,191 +4,197 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fw") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" + ) + @Export("NpcDefinition_archive") + public static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lko;" ) @Export("NpcDefinition_modelArchive") - static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("f") + public static AbstractArchive NpcDefinition_modelArchive; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("NpcDefinition_cached") public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("NpcDefinition_cachedModels") public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1515289597 + intValue = -644907951 ) @Export("id") public int id; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1088018541 + intValue = -1250402157 ) @Export("size") public int size; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("models") int[] models; - @ObfuscatedName("e") - int[] field1718; - @ObfuscatedName("i") + @ObfuscatedName("j") + int[] field1722; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1270107499 + intValue = -611299157 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1171504345 + intValue = -1914071611 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 394531495 + intValue = 482215935 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -232736363 + intValue = 1771727167 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -881733323 + intValue = 1040886561 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1920207017 + intValue = -1898345849 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1537396939 + intValue = 1312411327 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("actions") public String[] actions; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1028709613 + intValue = 1462580569 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -529562005 + intValue = 12207147 ) @Export("widthScale") int widthScale; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2054988051 + intValue = 43942703 ) @Export("heightScale") int heightScale; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -162717189 + intValue = 1242498855 ) @Export("ambient") int ambient; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 828954615 + intValue = 1010788091 ) @Export("contrast") int contrast; - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 725954355 + intValue = 170889589 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1149818581 + intValue = 387314403 ) @Export("rotation") public int rotation; - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("transforms") public int[] transforms; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 860386671 + intValue = -108342367 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 2079885181 + intValue = 1806959031 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("params") IterableNodeHashTable params; static { - NpcDefinition_cached = new EvictingDualNodeHashTable(64); - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); + NpcDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 19 } NPCComposition() { - this.name = "null"; - this.size = 1; + this.name = "null"; // L: 21 + this.size = 1; // L: 22 this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -199,10 +205,10 @@ public class NPCComposition extends DualNode { this.actions = new String[5]; this.drawMapDot = true; this.combatLevel = -1; - this.widthScale = 128; - this.heightScale = 128; - this.isVisible = false; - this.ambient = 0; + this.widthScale = 128; // L: 39 + this.heightScale = 128; // L: 40 + this.isVisible = false; // L: 41 + this.ambient = 0; // L: 42 this.contrast = 0; this.headIconPrayer = -1; this.rotation = 32; @@ -211,409 +217,404 @@ public class NPCComposition extends DualNode { this.isInteractable = true; this.isClickable = true; this.isFollower = false; - } + } // L: 54 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1073909210" + garbageValue = "-1919612079" ) @Export("postDecode") void postDecode() { - } + } // L: 68 - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-269433107" + descriptor = "(Lop;I)V", + garbageValue = "-1322212513" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 72 + if (var2 == 0) { // L: 73 + return; // L: 76 } - this.decodeNext(var1, var2); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "32" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - int var3; - int var4; - if (var2 == 1) { - var3 = var1.readUnsignedByte(); - this.models = new int[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.models[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 2) { - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { - this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { - this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { - this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { - this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { - this.turnRightSequence = var1.readUnsignedShort(); - } 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) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 60) { - var3 = var1.readUnsignedByte(); - this.field1718 = new int[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.field1718[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 93) { - this.drawMapDot = false; - } else if (var2 == 95) { - this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { - this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { - this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { - this.isVisible = true; - } else if (var2 == 100) { - this.ambient = var1.readByte(); - } else if (var2 == 101) { - this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { - this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { - this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { - if (var2 == 107) { - this.isInteractable = false; - } else if (var2 == 109) { - this.isClickable = false; - } else if (var2 == 111) { - this.isFollower = true; - } else if (var2 == 249) { - this.params = KeyHandler.readStringIntParameters(var1, this.params); - } - } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { - this.transformVarp = -1; - } - - var3 = -1; - if (var2 == 118) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { - var3 = -1; - } - } - - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; - - 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; - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lfe;ILfe;IB)Lhl;", - garbageValue = "122" - ) - @Export("getModel") - public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - 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) { - boolean var6 = false; - - for (int var7 = 0; var7 < this.models.length; ++var7) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { - var6 = true; - } - } - - if (var6) { - return null; - } - - ModelData[] var8 = new ModelData[this.models.length]; - - int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { - var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); - } - - ModelData var10; - if (var8.length == 1) { - var10 = var8[0]; - } else { - var10 = new ModelData(var8, var8.length); - } - - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - 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); - NpcDefinition_cachedModels.put(var5, (long)this.id); - } - - Model var11; - if (var1 != null && var3 != null) { - var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { - var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { - var11 = var3.transformActorModel(var5, var4); - } else { - var11 = var5.toSharedSequenceModel(true); - } - - if (this.widthScale != 128 || this.heightScale != 128) { - var11.scale(this.widthScale, this.heightScale, this.widthScale); - } - - return var11; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)Lgi;", - garbageValue = "-76" - ) - @Export("getModelData") - public final ModelData getModelData() { - if (this.transforms != null) { - NPCComposition var7 = this.transform(); - return var7 == null ? null : var7.getModelData(); - } else if (this.field1718 == null) { - return null; - } else { - boolean var1 = false; - - for (int var2 = 0; var2 < this.field1718.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1718[var2], 0)) { - var1 = true; - } - } - - if (var1) { - return null; - } else { - ModelData[] var5 = new ModelData[this.field1718.length]; - - for (int var3 = 0; var3 < this.field1718.length; ++var3) { - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1718[var3], 0); - } - - ModelData var6; - if (var5.length == 1) { - var6 = var5[0]; - } else { - var6 = new ModelData(var5, var5.length); - } - - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); - } - } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - return var6; - } + this.decodeNext(var1, var2); // L: 74 } } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lfg;", - garbageValue = "-200662944" + descriptor = "(Lop;II)V", + garbageValue = "2009660839" ) - @Export("transform") - public final NPCComposition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Varcs.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { - var1 = Varps.Varps_main[this.transformVarp]; - } + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + int var3; + int var4; + if (var2 == 1) { // L: 79 + var3 = var1.readUnsignedByte(); // L: 80 + this.models = new int[var3]; // L: 81 - int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; + for (var4 = 0; var4 < var3; ++var4) { // L: 82 + this.models[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 2) { // L: 84 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 12) { // L: 85 + this.size = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 86 + this.idleSequence = var1.readUnsignedShort(); + } else if (var2 == 14) { // L: 87 + this.walkSequence = var1.readUnsignedShort(); + } else if (var2 == 15) { // L: 88 + this.turnLeftSequence = var1.readUnsignedShort(); + } else if (var2 == 16) { // L: 89 + this.turnRightSequence = var1.readUnsignedShort(); + } else if (var2 == 17) { // L: 90 + this.walkSequence = var1.readUnsignedShort(); // L: 91 + this.walkBackSequence = var1.readUnsignedShort(); // L: 92 + this.walkLeftSequence = var1.readUnsignedShort(); // L: 93 + this.walkRightSequence = var1.readUnsignedShort(); // L: 94 + } else if (var2 == 18) { // L: 96 + var1.readUnsignedShort(); // L: 97 + } else if (var2 >= 30 && var2 < 35) { // L: 99 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 100 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 101 + this.actions[var2 - 30] = null; + } + } else if (var2 == 40) { // L: 103 + var3 = var1.readUnsignedByte(); // L: 104 + this.recolorFrom = new short[var3]; // L: 105 + this.recolorTo = new short[var3]; // L: 106 + + for (var4 = 0; var4 < var3; ++var4) { // L: 107 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 108 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 109 + } + } else if (var2 == 41) { // L: 112 + var3 = var1.readUnsignedByte(); // L: 113 + this.retextureFrom = new short[var3]; // L: 114 + this.retextureTo = new short[var3]; // L: 115 + + for (var4 = 0; var4 < var3; ++var4) { // L: 116 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 117 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 118 + } + } else if (var2 == 60) { // L: 121 + var3 = var1.readUnsignedByte(); // L: 122 + this.field1722 = new int[var3]; // L: 123 + + for (var4 = 0; var4 < var3; ++var4) { // L: 124 + this.field1722[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 93) { // L: 126 + this.drawMapDot = false; + } else if (var2 == 95) { // L: 127 + this.combatLevel = var1.readUnsignedShort(); + } else if (var2 == 97) { // L: 128 + this.widthScale = var1.readUnsignedShort(); + } else if (var2 == 98) { // L: 129 + this.heightScale = var1.readUnsignedShort(); + } else if (var2 == 99) { // L: 130 + this.isVisible = true; + } else if (var2 == 100) { // L: 131 + this.ambient = var1.readByte(); + } else if (var2 == 101) { // L: 132 + this.contrast = var1.readByte() * 5; + } else if (var2 == 102) { // L: 133 + this.headIconPrayer = var1.readUnsignedShort(); + } else if (var2 == 103) { // L: 134 + this.rotation = var1.readUnsignedShort(); + } else if (var2 != 106 && var2 != 118) { // L: 135 + if (var2 == 107) { // L: 153 + this.isInteractable = false; + } else if (var2 == 109) { // L: 154 + this.isClickable = false; + } else if (var2 == 111) { // L: 155 + this.isFollower = true; + } else if (var2 == 249) { // L: 156 + this.params = class13.readStringIntParameters(var1, this.params); + } } else { - var2 = this.transforms[this.transforms.length - 1]; + this.transformVarbit = var1.readUnsignedShort(); // L: 136 + if (this.transformVarbit == 65535) { // L: 137 + this.transformVarbit = -1; + } + + this.transformVarp = var1.readUnsignedShort(); // L: 138 + if (this.transformVarp == 65535) { // L: 139 + this.transformVarp = -1; + } + + var3 = -1; // L: 140 + if (var2 == 118) { // L: 141 + var3 = var1.readUnsignedShort(); // L: 142 + if (var3 == 65535) { // L: 143 + var3 = -1; + } + } + + var4 = var1.readUnsignedByte(); // L: 145 + this.transforms = new int[var4 + 2]; // L: 146 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 147 + this.transforms[var5] = var1.readUnsignedShort(); // L: 148 + if (this.transforms[var5] == 65535) { // L: 149 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 151 } - return var2 != -1 ? class112.getNpcDefinition(var2) : null; + } // L: 158 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lfm;ILfm;IB)Lhl;", + garbageValue = "-111" + ) + @Export("getModel") + public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { + if (this.transforms != null) { // L: 161 + NPCComposition var12 = this.transform(); // L: 162 + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 163 164 + } else { + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 166 + if (var5 == null) { // L: 167 + boolean var6 = false; // L: 168 + + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 169 + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { + var6 = true; + } + } + + if (var6) { // L: 170 + return null; + } + + ModelData[] var8 = new ModelData[this.models.length]; // L: 172 + + int var9; + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 173 + var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); + } + + ModelData var10; + if (var8.length == 1) { // L: 174 + var10 = var8[0]; + } else { + var10 = new ModelData(var8, var8.length); // L: 175 + } + + if (this.recolorFrom != null) { // L: 176 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 177 + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 178 + } + } + + if (this.retextureFrom != null) { // L: 181 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 182 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 183 + } + } + + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 186 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 187 + } + + Model var11; + if (var1 != null && var3 != null) { // L: 190 + var11 = var1.applyTransformations(var5, var2, var3, var4); + } else if (var1 != null) { // L: 191 + var11 = var1.transformActorModel(var5, var2); + } else if (var3 != null) { // L: 192 + var11 = var3.transformActorModel(var5, var4); + } else { + var11 = var5.toSharedSequenceModel(true); // L: 193 + } + + if (this.widthScale != 128 || this.heightScale != 128) { // L: 194 + var11.scale(this.widthScale, this.heightScale, this.widthScale); + } + + return var11; // L: 195 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)Lgk;", + garbageValue = "-100" + ) + @Export("getModelData") + public final ModelData getModelData() { + if (this.transforms != null) { // L: 199 + NPCComposition var7 = this.transform(); // L: 200 + return var7 == null ? null : var7.getModelData(); // L: 201 202 + } else if (this.field1722 == null) { // L: 204 + return null; + } else { + boolean var1 = false; // L: 205 + + for (int var2 = 0; var2 < this.field1722.length; ++var2) { // L: 206 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1722[var2], 0)) { + var1 = true; + } + } + + if (var1) { // L: 207 + return null; + } else { + ModelData[] var5 = new ModelData[this.field1722.length]; // L: 208 + + for (int var3 = 0; var3 < this.field1722.length; ++var3) { // L: 209 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1722[var3], 0); + } + + ModelData var6; + if (var5.length == 1) { + var6 = var5[0]; // L: 211 + } else { + var6 = new ModelData(var5, var5.length); // L: 212 + } + + int var4; + if (this.recolorFrom != null) { // L: 213 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 214 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 215 + } + } + + if (this.retextureFrom != null) { // L: 218 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 219 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 220 + } + } + + return var6; // L: 223 + } + } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-27313" + descriptor = "(I)Lfw;", + garbageValue = "2130221153" + ) + @Export("transform") + public final NPCComposition transform() { + int var1 = -1; // L: 227 + if (this.transformVarbit != -1) { // L: 228 + var1 = class119.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 229 + var1 = Varps.Varps_main[this.transformVarp]; + } + + int var2; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 231 + var2 = this.transforms[var1]; // L: 232 + } else { + var2 = this.transforms[this.transforms.length - 1]; + } + + return var2 != -1 ? ScriptFrame.getNpcDefinition(var2) : null; // L: 233 234 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-106692934" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 238 return true; } else { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Varcs.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 239 + if (this.transformVarbit != -1) { // L: 240 + var1 = class119.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 241 var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { - return this.transforms[var1] != -1; + if (var1 >= 0 && var1 < this.transforms.length) { // L: 242 + return this.transforms[var1] != -1; // L: 243 } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "62" + descriptor = "(III)I", + garbageValue = "-1437927998" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return NPC.method2251(this.params, var1, var2); // L: 247 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-664700971" + garbageValue = "-1913888789" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; + return VarbitComposition.method3205(this.params, var1, var2); // L: 251 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILop;B)Ley;", + garbageValue = "0" + ) + public static class150 method3152(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 24 + boolean var3 = (var2 & 1) != 0; // L: 25 + boolean var4 = (var2 & 2) != 0; // L: 26 + class150 var5 = new class150(var0); // L: 27 + int var6; + int[] var7; + boolean var8; + int var9; + short var10; + if (var3) { // L: 28 + var6 = var1.readUnsignedByte(); // L: 29 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 + var8 = var5.field1598 != null && var7.length == var5.field1598.length; // L: 33 + + for (var9 = 0; var9 < 2; ++var9) { // L: 34 + if (var7[var9] != 15) { // L: 35 + var10 = (short)var1.readUnsignedShort(); // L: 36 + if (var8) { // L: 37 + var5.field1598[var7[var9]] = var10; // L: 38 + } + } } } - return var3; - } + if (var4) { // L: 43 + var6 = var1.readUnsignedByte(); // L: 44 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 + var8 = var5.field1600 != null && var7.length == var5.field1600.length; // L: 48 - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1600615285" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; + 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.field1600[var7[var9]] = var10; // L: 53 + } + } + } } - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; + return var5; // L: 58 } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 2961e2743f..f8847587ea 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,55 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ex") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 2235084272698611857L + longValue = 3916314053745196243L ) @Export("lastTimeNano") long lastTimeNano; - NanoClock() { - this.lastTimeNano = System.nanoTime(); - } + public NanoClock() { + this.lastTimeNano = System.nanoTime(); // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-973245062" + garbageValue = "1421350581" ) @Export("mark") public void mark() { - this.lastTimeNano = System.nanoTime(); - } + this.lastTimeNano = System.nanoTime(); // L: 14 + } // L: 15 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "904483746" + garbageValue = "1121035205" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; - long var5 = this.lastTimeNano - System.nanoTime(); - if (var5 < var3) { + long var3 = 1000000L * (long)var2; // L: 18 + long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 + if (var5 < var3) { // L: 20 var5 = var3; } - class121.method2542(var5 / 1000000L); - long var7 = System.nanoTime(); + FloorUnderlayDefinition.method3190(var5 / 1000000L); // L: 21 + long var7 = System.nanoTime(); // L: 22 int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { - ++var9; + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { // L: 23 24 26 + ++var9; // L: 25 } - if (this.lastTimeNano < var7) { + if (this.lastTimeNano < var7) { // L: 28 this.lastTimeNano = var7; } - return var9; + return var9; // L: 29 } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 174bcdce80..9f4c69385d 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,141 +5,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("kk") @Implements("NetCache") public class NetCache { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lmp;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -639284241 + intValue = -656127147 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -8014822856304325521L - ) - public static long field3715; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -729381363 + intValue = 1571433569 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 519470009 + intValue = -1196232217 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lka;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("NetCache_pendingWrites") static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1002321909 + intValue = -1794044669 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 958917169 + intValue = 1069606977 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lop;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -358118347 + intValue = 862783157 ) - public static int field3726; - @ObfuscatedName("p") + public static int field3707; + @ObfuscatedName("q") @Export("NetCache_crc") public static CRC32 NetCache_crc; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lky;" + descriptor = "[Lkd;" ) @Export("NetCache_archives") public static Archive[] NetCache_archives; - @ObfuscatedName("o") - public static byte field3724; - @ObfuscatedName("r") + @ObfuscatedName("m") + public static byte field3719; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -240410497 + intValue = -883980279 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -720954157 + intValue = 735412947 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; static { - 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); - field3726 = 0; - NetCache_crc = new CRC32(); - NetCache_archives = new Archive[256]; - field3724 = 0; - NetCache_crcMismatches = 0; - NetCache_ioExceptions = 0; - } - - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "29415" - ) - static int method5335(int var0) { - return var0 * 3 + 600; + 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 + field3707 = 0; // L: 28 + NetCache_crc = new CRC32(); // L: 30 + NetCache_archives = new Archive[256]; // L: 32 + field3719 = 0; // L: 33 + NetCache_crcMismatches = 0; // L: 34 + NetCache_ioExceptions = 0; // L: 35 } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 5a08d09ea7..39c03cf1a0 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -3,82 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kr") +@ObfuscatedName("kj") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("bn") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Loz;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lkd;" ) @Export("archive") public Archive archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 782629149 + intValue = 1566075383 ) @Export("crc") public int crc; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("padding") public byte padding; NetFileRequest() { - } + } // L: 10 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "32" + descriptor = "(II)Log;", + garbageValue = "-1401189412" ) - static int method5215(int var0, Script var1, boolean var2) { - Widget var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Interpreter.Widget_unpackTargetMask(WorldMapRegion.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } + public static class392 method5300(int var0) { + int var1 = class390.field4266[var0]; // L: 11 + if (var1 == 1) { // L: 12 + return class392.field4276; // L: 13 + } else if (var1 == 2) { // L: 15 + return class392.field4271; // L: 16 } else { - int var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + return var1 == 3 ? class392.field4270 : null; // L: 18 19 21 } } - - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1769707986" - ) - static void method5216(int var0) { - class137.tempMenuAction = new MenuAction(); - class137.tempMenuAction.param0 = Client.menuArguments1[var0]; - class137.tempMenuAction.param1 = Client.menuArguments2[var0]; - class137.tempMenuAction.opcode = Client.menuOpcodes[var0]; - class137.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - class137.tempMenuAction.action = Client.menuActions[var0]; - } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 2ffcbf601b..1706dc7c4c 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,60 +9,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("eb") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("l") - @Export("inputStream") - InputStream inputStream; - @ObfuscatedName("q") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Loe;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("i") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("f") + @ObfuscatedName("w") + @Export("inputStream") + InputStream inputStream; + @ObfuscatedName("s") @Export("socket") Socket socket; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("isClosed") boolean isClosed; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lew;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lev;" ) @Export("task") Task task; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 64228111 + intValue = 23689551 ) @Export("outLength") int outLength; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1225005773 + intValue = -1817332035 ) @Export("outOffset") int outOffset; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1364680617 + intValue = 401992191 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 562282025 + intValue = -955072145 ) @Export("maxPacketLength") final int maxPacketLength; @@ -71,159 +77,159 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(Ljava/net/Socket;Lew;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { - this.isClosed = false; - this.outLength = 0; - this.outOffset = 0; - this.exceptionWriting = false; - this.taskHandler = var2; - this.socket = var1; - this.bufferLength = var3; - this.maxPacketLength = var3 - 100; - this.socket.setSoTimeout(30000); - this.socket.setTcpNoDelay(true); - this.socket.setReceiveBufferSize(65536); - this.socket.setSendBufferSize(65536); - this.inputStream = this.socket.getInputStream(); - this.outputStream = this.socket.getOutputStream(); + this.isClosed = false; // L: 16 + this.outLength = 0; // L: 20 + this.outOffset = 0; // L: 21 + this.exceptionWriting = false; // L: 22 + this.taskHandler = var2; // L: 28 + this.socket = var1; // L: 29 + this.bufferLength = var3; // L: 30 + this.maxPacketLength = var3 - 100; // L: 31 + this.socket.setSoTimeout(30000); // L: 32 + this.socket.setTcpNoDelay(true); // L: 33 + this.socket.setReceiveBufferSize(65536); // L: 34 + this.socket.setSendBufferSize(65536); // L: 35 + this.inputStream = this.socket.getInputStream(); // L: 36 + this.outputStream = this.socket.getOutputStream(); // L: 37 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "82" + garbageValue = "1" ) @Export("close") public void close() { - if (!this.isClosed) { - synchronized(this) { - this.isClosed = true; - this.notifyAll(); - } + if (!this.isClosed) { // L: 41 + synchronized(this) { // L: 42 + this.isClosed = true; // L: 43 + this.notifyAll(); // L: 44 + } // L: 45 - if (this.task != null) { - while (this.task.status == 0) { - class121.method2542(1L); + if (this.task != null) { // L: 46 + while (this.task.status == 0) { // L: 47 + FloorUnderlayDefinition.method3190(1L); // L: 48 } - if (this.task.status == 1) { + if (this.task.status == 1) { // L: 50 try { - ((Thread)this.task.result).join(); - } catch (InterruptedException var3) { + ((Thread)this.task.result).join(); // L: 52 + } catch (InterruptedException var3) { // L: 54 } } } - this.task = null; + this.task = null; // L: 57 } - } + } // L: 58 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1780579727" + garbageValue = "1953698452" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); + return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-973037380" + garbageValue = "-1632705310" ) @Export("available") public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); + return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1444896063" + garbageValue = "-1771919747" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { + if (this.isClosed) { // L: 75 return false; } else { - return this.inputStream.available() >= var1; + return this.inputStream.available() >= var1; // L: 76 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-95" + descriptor = "([BIII)I", + garbageValue = "-1246528305" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { + if (this.isClosed) { // L: 80 return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); - if (var5 <= 0) { + 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 throw new EOFException(); } - var2 += var5; + var2 += var5; // L: 85 } - return var4; + return var4; // L: 88 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-595308050" + descriptor = "([BIIB)V", + garbageValue = "0" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { - if (this.exceptionWriting) { - this.exceptionWriting = false; - throw new IOException(); + if (!this.isClosed) { // L: 92 + if (this.exceptionWriting) { // L: 93 + this.exceptionWriting = false; // L: 94 + throw new IOException(); // L: 95 } else { - if (this.outBuffer == null) { + if (this.outBuffer == null) { // L: 97 this.outBuffer = new byte[this.bufferLength]; } - synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.outBuffer[this.outOffset] = var1[var5 + var2]; - this.outOffset = (this.outOffset + 1) % this.bufferLength; - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { - throw new IOException(); + 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.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102 + throw new IOException(); // L: 103 } } - if (this.task == null) { - this.task = this.taskHandler.newThreadTask(this, 3); + if (this.task == null) { // L: 106 + this.task = this.taskHandler.newThreadTask(this, 3); // L: 107 } - this.notifyAll(); + this.notifyAll(); // L: 109 } } } - } + } // L: 111 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "34744814" + garbageValue = "-748791607" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); - } + this.write0(var1, var2, var3); // L: 160 + } // L: 161 protected void finalize() { - this.close(); - } + this.close(); // L: 61 + } // L: 62 public void run() { try { @@ -231,800 +237,496 @@ public final class NetSocket extends AbstractSocket implements Runnable { label84: { int var1; int var2; - synchronized(this) { - if (this.outOffset == this.outLength) { - if (this.isClosed) { + synchronized(this) { // L: 118 + if (this.outOffset == this.outLength) { // L: 119 + if (this.isClosed) { // L: 120 break label84; } try { - this.wait(); - } catch (InterruptedException var10) { + this.wait(); // L: 122 + } catch (InterruptedException var10) { // L: 124 } } - var2 = this.outLength; - if (this.outOffset >= this.outLength) { + var2 = this.outLength; // L: 126 + if (this.outOffset >= this.outLength) { // L: 127 var1 = this.outOffset - this.outLength; } else { - var1 = this.bufferLength - this.outLength; + var1 = this.bufferLength - this.outLength; // L: 128 } } - if (var1 <= 0) { + if (var1 <= 0) { // L: 130 continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); - } catch (IOException var9) { - this.exceptionWriting = true; + this.outputStream.write(this.outBuffer, var2, var1); // L: 132 + } catch (IOException var9) { // L: 134 + this.exceptionWriting = true; // L: 135 } - this.outLength = (var1 + this.outLength) % this.bufferLength; + this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 try { - if (this.outOffset == this.outLength) { + if (this.outLength == this.outOffset) { // L: 139 this.outputStream.flush(); } - } catch (IOException var8) { - this.exceptionWriting = true; + } catch (IOException var8) { // L: 141 + this.exceptionWriting = true; // L: 142 } continue; } try { - if (this.inputStream != null) { + if (this.inputStream != null) { // L: 147 this.inputStream.close(); } - if (this.outputStream != null) { + if (this.outputStream != null) { // L: 148 this.outputStream.close(); } - if (this.socket != null) { + if (this.socket != null) { // L: 149 this.socket.close(); } - } catch (IOException var7) { + } catch (IOException var7) { // L: 151 } - this.outBuffer = null; + this.outBuffer = null; // L: 152 break; } - } catch (Exception var12) { - Timer.RunException_sendStackTrace((String)null, var12); + } catch (Exception var12) { // L: 154 + MilliClock.RunException_sendStackTrace((String)null, var12); // L: 155 } - } + } // L: 157 - @ObfuscatedName("jt") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([Ljt;IIIIIIII)V", - garbageValue = "-1869805542" + descriptor = "(IIII)J", + garbageValue = "965371090" ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapRegion.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (ObjectSound.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != VarpDefinition.mousedOverWidgetIf1 && ObjectSound.isComponentHidden(var9)) { - continue; - } - - int var10 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else { - int var16; - if (var9.type == 9) { - var16 = var10; - var17 = var11; - var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var10) { - var16 = var18; - var18 = var10; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var10 + var9.width; - var17 = var11 + var9.height; - var12 = var10 > var2 ? var10 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - } - - if (var9 == Client.clickedWidget) { - Client.field671 = true; - Client.field672 = var10; - Client.field608 = var11; - } - - boolean var33 = false; - if (var9.field3121) { - switch(Client.field509) { - case 0: - var33 = true; - case 1: - default: - break; - case 2: - if (Client.field673 == var9.id >>> 16) { - var33 = true; - } - break; - case 3: - if (var9.id == Client.field673) { - var33 = true; - } - } - } - - if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var26; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent) { - var26.remove(); - var26.widget.containsMouse = false; - } - } - - if (MouseHandler.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class174.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { - var26.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var34) { - TaskHandler.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class92.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - TileItem.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var34) { - if (var9.contentType == 1400) { - TileItem.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - SoundSystem.Widget_addToMenu(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var33) { - for (int var20 = 0; var20 < var9.field3115.length; ++var20) { - var21 = false; - boolean var27 = false; - if (!var21 && var9.field3115[var20] != null) { - for (var23 = 0; var23 < var9.field3115[var20].length; ++var23) { - boolean var24 = false; - if (var9.field3190 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3115[var20][var23]]; - } - - if (ModeWhere.method5483(var9.field3115[var20][var23]) || var24) { - var21 = true; - if (var9.field3190 != null && var9.field3190[var20] > Client.cycle) { - break; - } - - byte var32 = var9.field3123[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) { - if (var20 < 10) { - ReflectionCheck.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - class258.Widget_runOnTargetLeave(); - ArchiveDiskAction.selectSpell(var9.id, var9.childIndex, Interpreter.Widget_unpackTargetMask(WorldMapRegion.getWidgetFlags(var9)), var9.itemId); - Client.selectedSpellActionName = GameEngine.Widget_getSpellActionName(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + FloorUnderlayDefinition.colorStartTag(16777215); - } - - var23 = var9.field3147[var20]; - if (var9.field3190 == null) { - var9.field3190 = new int[var9.field3115.length]; - } - - if (var9.field3066 == null) { - var9.field3066 = new int[var9.field3115.length]; - } - - if (var23 != 0) { - if (var9.field3190[var20] == 0) { - var9.field3190[var20] = var23 + Client.cycle + var9.field3066[var20]; - } else { - var9.field3190[var20] = var23 + Client.cycle; - } - } else { - var9.field3190[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field3190 != null) { - var9.field3190[var20] = 0; - } - } - } - - 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; - } - - boolean var35 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { - var35 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.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) { - GrandExchangeEvents.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - TileItem.worldMap.method6603(var17, var18, var34 & var35, var34 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && GrandExchangeOfferTotalQuantityComparator.method5360(WorldMapRegion.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field595 = true; - Client.field669 = var10; - Client.field670 = var11; - } - - if (var9.hasListener) { - ScriptEvent var22; - 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 || GameEngine.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var35 = false; - var34 = false; - } - - 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) { - 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) { - 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.field695.addFirst(var22); - } - } - - 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) { - 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) { - 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) { - 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.field695.addFirst(var22); - } - } - - if (var9.onTimer != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onTimer; - Client.field731.addFirst(var22); - } - - ScriptEvent var25; - int var36; - int var37; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3185) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3185 <= 32) { - label814: - for (var37 = var9.field3185; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 31]; - - 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 label814; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3185 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.field679 > var9.field3186) { - if (var9.invTransmitTriggers != null && Client.field679 - var9.field3186 <= 32) { - label790: - for (var37 = var9.field3186; var37 < Client.field679; ++var37) { - var23 = Client.changedItemContainers[var37 & 31]; - - 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 label790; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3186 = Client.field679; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3187) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3187 <= 32) { - label766: - for (var37 = var9.field3187; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 31]; - - 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 label766; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3187 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3064 && var9.onChatTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field685 > var9.field3064 && var9.onFriendTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field686 > var9.field3064 && var9.onClanTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field687 > var9.field3064 && var9.field3161 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3161; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field594 > var9.field3064 && var9.field3163 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3163; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field577 > var9.field3064 && var9.onStockTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field489 > var9.field3064 && var9.field3168 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3168; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field691 > var9.field3064 && var9.onMiscTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3064 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field726; ++var37) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field718[var37]; - var31.keyPressed = Client.field532[var37]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - - ScriptEvent var30; - int[] var38; - if (var9.field3157 != null) { - var38 = ByteArrayPool.method5897(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3157; - Client.scriptEvents.addFirst(var30); - } - } - - if (var9.field3158 != null) { - var38 = Tile.method4116(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3158; - Client.scriptEvents.addFirst(var30); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || GameEngine.dragInventoryWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - VarpDefinition.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - VarpDefinition.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - PlayerType.field3661 = var9; - } - - if (var9.scrollHeight > var9.height) { - ViewportMouse.method4559(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var28 != null) { - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var29.isMouseInputEvent) { - var29.remove(); - var29.widget.containsMouse = false; - } - } - - if (MouseHandler.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class174.addCancelMenuEntry(); - } - } - - class87.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } - } - + static long method2923(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 } - @ObfuscatedName("ji") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "27" + descriptor = "(I)V", + garbageValue = "1408375765" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class120.method2530(); - ViewportMouse.method4556(); - int var1 = ApproximateRouteStrategy.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - class268.method5105(0.9D); - } + @Export("load") + static void load() { + int var25; + if (Client.titleLoadingStage == 0) { // L: 2002 + GameBuild.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 2003 - if (var2 == 2) { - class268.method5105(0.8D); - } - - if (var2 == 3) { - class268.method5105(0.7D); - } - - if (var2 == 4) { - class268.method5105(0.6D); - } + for (var25 = 0; var25 < 4; ++var25) { // L: 2004 + Client.collisionMaps[var25] = new CollisionMap(104, 104); } - if (var1 == 3) { - if (var2 == 0) { - class29.method430(255); + class10.sceneMinimapSprite = new SpritePixels(512, 512); // L: 2005 + Login.Login_loadingText = "Starting game engine..."; // L: 2006 + Login.Login_loadingPercent = 5; // L: 2007 + Client.titleLoadingStage = 20; // L: 2008 + } else if (Client.titleLoadingStage == 20) { // L: 2011 + Login.Login_loadingText = "Prepared visibility map"; // L: 2012 + Login.Login_loadingPercent = 10; // L: 2013 + Client.titleLoadingStage = 30; // L: 2014 + } else if (Client.titleLoadingStage == 30) { // L: 2017 + InvDefinition.archive0 = UrlRequest.newArchive(0, false, true, true); // L: 2018 + ApproximateRouteStrategy.archive1 = UrlRequest.newArchive(1, false, true, true); // L: 2019 + class1.archive2 = UrlRequest.newArchive(2, true, false, true); // L: 2020 + ParamComposition.archive3 = UrlRequest.newArchive(3, false, true, true); // L: 2021 + class12.archive4 = UrlRequest.newArchive(4, false, true, true); // L: 2022 + class11.archive5 = UrlRequest.newArchive(5, true, true, true); // L: 2023 + Messages.archive6 = UrlRequest.newArchive(6, true, true, true); // L: 2024 + HorizontalAlignment.archive7 = UrlRequest.newArchive(7, false, true, true); // L: 2025 + GrandExchangeOfferOwnWorldComparator.archive8 = UrlRequest.newArchive(8, false, true, true); // L: 2026 + SecureRandomFuture.archive9 = UrlRequest.newArchive(9, false, true, true); // L: 2027 + ChatChannel.archive10 = UrlRequest.newArchive(10, false, true, true); // L: 2028 + AbstractWorldMapIcon.archive11 = UrlRequest.newArchive(11, false, true, true); // L: 2029 + class14.archive12 = UrlRequest.newArchive(12, false, true, true); // L: 2030 + LoginScreenAnimation.archive13 = UrlRequest.newArchive(13, true, false, true); // L: 2031 + SecureRandomCallable.archive14 = UrlRequest.newArchive(14, false, true, true); // L: 2032 + Archive.archive15 = UrlRequest.newArchive(15, false, true, true); // L: 2033 + Message.archive17 = UrlRequest.newArchive(17, true, true, true); // L: 2034 + Messages.archive18 = UrlRequest.newArchive(18, false, true, true); // L: 2035 + class111.archive19 = UrlRequest.newArchive(19, false, true, true); // L: 2036 + GrandExchangeOfferOwnWorldComparator.archive20 = UrlRequest.newArchive(20, false, true, true); // L: 2037 + Login.Login_loadingText = "Connecting to update server"; // L: 2038 + Login.Login_loadingPercent = 20; // L: 2039 + Client.titleLoadingStage = 40; // L: 2040 + } else if (Client.titleLoadingStage == 40) { // L: 2043 + byte var39 = 0; // L: 2044 + var25 = var39 + InvDefinition.archive0.percentage() * 4 / 100; // L: 2045 + var25 += ApproximateRouteStrategy.archive1.percentage() * 4 / 100; // L: 2046 + var25 += class1.archive2.percentage() * 2 / 100; // L: 2047 + var25 += ParamComposition.archive3.percentage() * 2 / 100; // L: 2048 + var25 += class12.archive4.percentage() * 6 / 100; // L: 2049 + var25 += class11.archive5.percentage() * 4 / 100; // L: 2050 + var25 += Messages.archive6.percentage() * 2 / 100; // L: 2051 + var25 += HorizontalAlignment.archive7.percentage() * 56 / 100; // L: 2052 + var25 += GrandExchangeOfferOwnWorldComparator.archive8.percentage() * 2 / 100; // L: 2053 + var25 += SecureRandomFuture.archive9.percentage() * 2 / 100; // L: 2054 + var25 += ChatChannel.archive10.percentage() * 2 / 100; // L: 2055 + var25 += AbstractWorldMapIcon.archive11.percentage() * 2 / 100; // L: 2056 + var25 += class14.archive12.percentage() * 2 / 100; // L: 2057 + var25 += LoginScreenAnimation.archive13.percentage() * 2 / 100; // L: 2058 + var25 += SecureRandomCallable.archive14.percentage() * 2 / 100; // L: 2059 + var25 += Archive.archive15.percentage() * 2 / 100; // L: 2060 + var25 += class111.archive19.percentage() / 100; // L: 2061 + var25 += Messages.archive18.percentage() / 100; // L: 2062 + var25 += GrandExchangeOfferOwnWorldComparator.archive20.percentage() / 100; // L: 2063 + var25 += Message.archive17.method5260() && Message.archive17.isFullyLoaded() ? 1 : 0; // L: 2064 + if (var25 != 100) { // L: 2065 + if (var25 != 0) { // L: 2066 + Login.Login_loadingText = "Checking for updates - " + var25 + "%"; } - if (var2 == 1) { - class29.method430(192); - } - - if (var2 == 2) { - class29.method430(128); - } - - if (var2 == 3) { - class29.method430(64); - } - - if (var2 == 4) { - class29.method430(0); - } + Login.Login_loadingPercent = 30; // L: 2067 + } else { + UserComparator8.method2460(InvDefinition.archive0, "Animations"); // L: 2070 + UserComparator8.method2460(ApproximateRouteStrategy.archive1, "Skeletons"); // L: 2071 + UserComparator8.method2460(class12.archive4, "Sound FX"); // L: 2072 + UserComparator8.method2460(class11.archive5, "Maps"); // L: 2073 + UserComparator8.method2460(Messages.archive6, "Music Tracks"); // L: 2074 + UserComparator8.method2460(HorizontalAlignment.archive7, "Models"); // L: 2075 + UserComparator8.method2460(GrandExchangeOfferOwnWorldComparator.archive8, "Sprites"); // L: 2076 + UserComparator8.method2460(AbstractWorldMapIcon.archive11, "Music Jingles"); // L: 2077 + UserComparator8.method2460(SecureRandomCallable.archive14, "Music Samples"); // L: 2078 + UserComparator8.method2460(Archive.archive15, "Music Patches"); // L: 2079 + UserComparator8.method2460(class111.archive19, "World Map"); // L: 2080 + UserComparator8.method2460(Messages.archive18, "World Map Geography"); // L: 2081 + UserComparator8.method2460(GrandExchangeOfferOwnWorldComparator.archive20, "World Map Ground"); // L: 2082 + class111.spriteIds = new GraphicsDefaults(); // L: 2083 + class111.spriteIds.decode(Message.archive17); // L: 2084 + Login.Login_loadingText = "Loaded update list"; // L: 2085 + Login.Login_loadingPercent = 30; // L: 2086 + Client.titleLoadingStage = 45; // L: 2087 } - - if (var1 == 4) { - if (var2 == 0) { - class129.updateSoundEffectVolume(127); - } - - if (var2 == 1) { - class129.updateSoundEffectVolume(96); - } - - if (var2 == 2) { - class129.updateSoundEffectVolume(64); - } - - if (var2 == 3) { - class129.updateSoundEffectVolume(32); - } - - if (var2 == 4) { - class129.updateSoundEffectVolume(0); - } - } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - Client.field655 = var2; - } - - if (var1 == 10) { - if (var2 == 0) { - GrandExchangeOfferOwnWorldComparator.method1104(127); - } - - if (var2 == 1) { - GrandExchangeOfferOwnWorldComparator.method1104(96); - } - - if (var2 == 2) { - GrandExchangeOfferOwnWorldComparator.method1104(64); - } - - if (var2 == 3) { - GrandExchangeOfferOwnWorldComparator.method1104(32); - } - - if (var2 == 4) { - GrandExchangeOfferOwnWorldComparator.method1104(0); - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - AttackOption[] var3; - if (var1 == 18) { - var3 = new AttackOption[]{AttackOption.field1234, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.field1237}; - Client.playerAttackOption = (AttackOption)class128.findEnumerated(var3, var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; + } else { + Archive var27; + Archive var28; + Archive var29; + if (Client.titleLoadingStage == 45) { // L: 2090 + boolean var38 = !Client.isLowDetail; // L: 2091 + UserComparator2.field4359 = 22050; // L: 2094 + PcmPlayer.PcmPlayer_stereo = var38; // L: 2095 + PcmPlayer.field272 = 2; // L: 2096 + MidiPcmStream var34 = new MidiPcmStream(); // L: 2098 + var34.method4761(9, 128); // L: 2099 + HealthBar.pcmPlayer0 = class112.method2522(GameEngine.taskHandler, 0, 22050); // L: 2100 + HealthBar.pcmPlayer0.setStream(var34); // L: 2101 + var27 = Archive.archive15; // L: 2102 + var28 = SecureRandomCallable.archive14; // L: 2103 + var29 = class12.archive4; // L: 2104 + class247.musicPatchesArchive = var27; // L: 2106 + class247.musicSamplesArchive = var28; // L: 2107 + class408.soundEffectsArchive = var29; // L: 2108 + class247.midiPcmStream = var34; // L: 2109 + ScriptEvent.pcmPlayer1 = class112.method2522(GameEngine.taskHandler, 1, 2048); // L: 2111 + BuddyRankComparator.pcmStreamMixer = new PcmStreamMixer(); // L: 2112 + ScriptEvent.pcmPlayer1.setStream(BuddyRankComparator.pcmStreamMixer); // L: 2113 + FontName.decimator = new Decimator(22050, UserComparator2.field4359); // L: 2114 + Login.Login_loadingText = "Prepared sound engine"; // L: 2115 + Login.Login_loadingPercent = 35; // L: 2116 + Client.titleLoadingStage = 50; // L: 2117 + MenuAction.WorldMapElement_fonts = new Fonts(GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2118 + } else { + int var1; + if (Client.titleLoadingStage == 50) { // L: 2121 + FontName[] var33 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 2124 + var1 = var33.length; // L: 2126 + Fonts var35 = MenuAction.WorldMapElement_fonts; // L: 2127 + FontName[] var36 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 2130 + Client.fontsMap = var35.createMap(var36); // L: 2132 + if (Client.fontsMap.size() < var1) { // L: 2133 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 2134 + Login.Login_loadingPercent = 40; // L: 2135 + } else { + FriendLoginUpdate.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2138 + class6.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2139 + Login.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2140 + class54.platformInfo = Client.platformInfoProvider.get(); // L: 2141 + Login.Login_loadingText = "Loaded fonts"; // L: 2142 + Login.Login_loadingPercent = 40; // L: 2143 + Client.titleLoadingStage = 60; // L: 2144 + } } else { - Client.combatTargetPlayerIndex = var2 & 2047; + int var3; + int var4; + Archive var26; + if (Client.titleLoadingStage == 60) { // L: 2147 + var26 = ChatChannel.archive10; // L: 2149 + var27 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2150 + var3 = 0; // L: 2152 + String[] var37 = Login.field885; // L: 2154 + + int var30; + String var31; + for (var30 = 0; var30 < var37.length; ++var30) { // L: 2155 + var31 = var37[var30]; // L: 2156 + if (var26.tryLoadFileByNames(var31, "")) { // L: 2158 + ++var3; + } + } + + var37 = Login.field871; // L: 2163 + + for (var30 = 0; var30 < var37.length; ++var30) { // L: 2164 + var31 = var37[var30]; // L: 2165 + if (var27.tryLoadFileByNames(var31, "")) { // L: 2167 + ++var3; + } + } + + var4 = ReflectionCheck.method1115(); // L: 2174 + if (var3 < var4) { // L: 2175 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 2176 + Login.Login_loadingPercent = 50; // L: 2177 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 2180 + Login.Login_loadingPercent = 50; // L: 2181 + WorldMapData_1.updateGameState(5); // L: 2182 + Client.titleLoadingStage = 70; // L: 2183 + } + } else if (Client.titleLoadingStage == 70) { // L: 2186 + if (!class1.archive2.isFullyLoaded()) { // L: 2187 + Login.Login_loadingText = "Loading config - " + class1.archive2.loadPercent() + "%"; // L: 2188 + Login.Login_loadingPercent = 60; // L: 2189 + } else { + Archive var32 = class1.archive2; // L: 2192 + FloorOverlayDefinition.FloorOverlayDefinition_archive = var32; // L: 2194 + var26 = class1.archive2; // L: 2196 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var26; // L: 2198 + var27 = class1.archive2; // L: 2200 + var28 = HorizontalAlignment.archive7; // L: 2201 + KitDefinition.KitDefinition_archive = var27; // L: 2203 + KitDefinition.KitDefinition_modelsArchive = var28; // L: 2204 + class67.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 2205 + var29 = class1.archive2; // L: 2207 + Archive var5 = HorizontalAlignment.archive7; // L: 2208 + boolean var6 = Client.isLowDetail; // L: 2209 + ObjectComposition.ObjectDefinition_archive = var29; // L: 2211 + ObjectComposition.ObjectDefinition_modelsArchive = var5; // L: 2212 + ObjectComposition.ObjectDefinition_isLowDetail = var6; // L: 2213 + Archive var7 = class1.archive2; // L: 2215 + Archive var8 = HorizontalAlignment.archive7; // L: 2216 + NPCComposition.NpcDefinition_archive = var7; // L: 2218 + NPCComposition.NpcDefinition_modelArchive = var8; // L: 2219 + class28.method405(class1.archive2); // L: 2221 + Archive var9 = class1.archive2; // L: 2222 + Archive var10 = HorizontalAlignment.archive7; // L: 2223 + boolean var11 = Client.isMembersWorld; // L: 2224 + Font var12 = FriendLoginUpdate.fontPlain11; // L: 2225 + DirectByteArrayCopier.ItemDefinition_archive = var9; // L: 2227 + HealthBarDefinition.ItemDefinition_modelArchive = var10; // L: 2228 + BuddyRankComparator.ItemDefinition_inMembersWorld = var11; // L: 2229 + class129.ItemDefinition_fileCount = DirectByteArrayCopier.ItemDefinition_archive.getGroupFileCount(10); // L: 2230 + SoundSystem.ItemDefinition_fontPlain11 = var12; // L: 2231 + Archive var13 = class1.archive2; // L: 2233 + Archive var14 = InvDefinition.archive0; // L: 2234 + Archive var15 = ApproximateRouteStrategy.archive1; // L: 2235 + SequenceDefinition.SequenceDefinition_archive = var13; // L: 2237 + SequenceDefinition.SequenceDefinition_animationsArchive = var14; // L: 2238 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var15; // L: 2239 + Archive var16 = class1.archive2; // L: 2241 + Archive var17 = HorizontalAlignment.archive7; // L: 2242 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var16; // L: 2244 + class389.SpotAnimationDefinition_modelArchive = var17; // L: 2245 + HealthBarUpdate.method2183(class1.archive2); // L: 2247 + Players.method2327(class1.archive2); // L: 2248 + class128.method2720(ParamComposition.archive3, HorizontalAlignment.archive7, GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2249 + Archive var18 = class1.archive2; // L: 2250 + InvDefinition.InvDefinition_archive = var18; // L: 2252 + UserComparator7.method2463(class1.archive2); // L: 2254 + MouseRecorder.method2093(class1.archive2); // L: 2255 + class28.method400(class1.archive2); // L: 2256 + FileSystem.field1564 = new class387(RouteStrategy.field1986, 54, MouseHandler.clientLanguage, class1.archive2); // L: 2257 + class240.HitSplatDefinition_cachedSprites = new class387(RouteStrategy.field1986, 47, MouseHandler.clientLanguage, class1.archive2); // L: 2258 + Message.varcs = new Varcs(); // L: 2259 + class20.method295(class1.archive2, GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2260 + Archive var19 = class1.archive2; // L: 2261 + Archive var20 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2262 + HealthBarDefinition.HealthBarDefinition_archive = var19; // L: 2264 + HealthBarDefinition.field1658 = var20; // L: 2265 + Archive var21 = class1.archive2; // L: 2267 + Archive var22 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2268 + WorldMapElement.WorldMapElement_archive = var22; // L: 2270 + if (var21.isFullyLoaded()) { // L: 2271 + WorldMapElement.WorldMapElement_count = var21.getGroupFileCount(35); // L: 2274 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2275 + + for (int var23 = 0; var23 < WorldMapElement.WorldMapElement_count; ++var23) { // L: 2276 + byte[] var24 = var21.takeFile(35, var23); // L: 2277 + WorldMapElement.WorldMapElement_cached[var23] = new WorldMapElement(var23); // L: 2278 + if (var24 != null) { // L: 2279 + WorldMapElement.WorldMapElement_cached[var23].decode(new Buffer(var24)); // L: 2280 + WorldMapElement.WorldMapElement_cached[var23].method3008(); // L: 2281 + } + } + } + + Login.Login_loadingText = "Loaded config"; // L: 2285 + Login.Login_loadingPercent = 60; // L: 2286 + Client.titleLoadingStage = 80; // L: 2287 + } + } else if (Client.titleLoadingStage == 80) { // L: 2290 + var25 = 0; // L: 2291 + if (class114.compass == null) { // L: 2292 + class114.compass = WorldMapSection0.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.compass, 0); + } else { + ++var25; // L: 2293 + } + + if (BoundaryObject.redHintArrowSprite == null) { // L: 2294 + BoundaryObject.redHintArrowSprite = WorldMapSection0.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4008, 0); + } else { + ++var25; // L: 2295 + } + + if (TriBool.mapSceneSprites == null) { // L: 2296 + TriBool.mapSceneSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.mapScenes, 0); + } else { + ++var25; // L: 2297 + } + + if (Client.headIconPkSprites == null) { // L: 2298 + Client.headIconPkSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.headIconsPk, 0); + } else { + ++var25; // L: 2299 + } + + if (ServerPacket.headIconPrayerSprites == null) { // L: 2300 + ServerPacket.headIconPrayerSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4011, 0); + } else { + ++var25; // L: 2301 + } + + if (DevicePcmPlayerProvider.headIconHintSprites == null) { // L: 2302 + DevicePcmPlayerProvider.headIconHintSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4012, 0); + } else { + ++var25; // L: 2303 + } + + if (WorldMapIcon_0.mapMarkerSprites == null) { // L: 2304 + WorldMapIcon_0.mapMarkerSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4013, 0); + } else { + ++var25; // L: 2305 + } + + if (UserComparator10.crossSprites == null) { // L: 2306 + UserComparator10.crossSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4014, 0); + } else { + ++var25; // L: 2307 + } + + if (class115.mapDotSprites == null) { // L: 2308 + class115.mapDotSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4010, 0); + } else { + ++var25; // L: 2309 + } + + if (GameEngine.scrollBarSprites == null) { // L: 2310 + GameEngine.scrollBarSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4018, 0); + } else { + ++var25; // L: 2311 + } + + if (class7.modIconSprites == null) { // L: 2312 + class7.modIconSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4016, 0); + } else { + ++var25; // L: 2313 + } + + if (var25 < 11) { // L: 2314 + Login.Login_loadingText = "Loading sprites - " + var25 * 100 / 12 + "%"; // L: 2315 + Login.Login_loadingPercent = 70; // L: 2316 + } else { + AbstractFont.AbstractFont_modIconSprites = class7.modIconSprites; // L: 2319 + BoundaryObject.redHintArrowSprite.normalize(); // L: 2320 + var1 = (int)(Math.random() * 21.0D) - 10; // L: 2321 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 2322 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 2323 + var4 = (int)(Math.random() * 41.0D) - 20; // L: 2324 + TriBool.mapSceneSprites[0].shiftColors(var1 + var4, var2 + var4, var4 + var3); // L: 2325 + Login.Login_loadingText = "Loaded sprites"; // L: 2326 + Login.Login_loadingPercent = 70; // L: 2327 + Client.titleLoadingStage = 90; // L: 2328 + } + } else if (Client.titleLoadingStage == 90) { // L: 2331 + if (!SecureRandomFuture.archive9.isFullyLoaded()) { // L: 2332 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2333 + Login.Login_loadingPercent = 90; // L: 2334 + } else { + Varcs.textureProvider = new TextureProvider(SecureRandomFuture.archive9, GrandExchangeOfferOwnWorldComparator.archive8, 20, class408.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); // L: 2337 + Rasterizer3D.Rasterizer3D_setTextureLoader(Varcs.textureProvider); // L: 2338 + Rasterizer3D.Rasterizer3D_setBrightness(class408.clientPreferences.brightness); // L: 2339 + Client.titleLoadingStage = 100; // L: 2340 + } + } else if (Client.titleLoadingStage == 100) { // L: 2343 + var25 = Varcs.textureProvider.getLoadedPercentage(); // L: 2344 + if (var25 < 100) { // L: 2345 + Login.Login_loadingText = "Loading textures - " + var25 + "%"; // L: 2346 + Login.Login_loadingPercent = 90; // L: 2347 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 2350 + Login.Login_loadingPercent = 90; // L: 2351 + Client.titleLoadingStage = 110; // L: 2352 + } + } else if (Client.titleLoadingStage == 110) { // L: 2355 + Interpreter.mouseRecorder = new MouseRecorder(); // L: 2356 + GameEngine.taskHandler.newThreadTask(Interpreter.mouseRecorder, 10); // L: 2357 + Login.Login_loadingText = "Loaded input handler"; // L: 2358 + Login.Login_loadingPercent = 92; // L: 2359 + Client.titleLoadingStage = 120; // L: 2360 + } else if (Client.titleLoadingStage == 120) { // L: 2363 + if (!ChatChannel.archive10.tryLoadFileByNames("huffman", "")) { // L: 2364 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2365 + Login.Login_loadingPercent = 94; // L: 2366 + } else { + Huffman var0 = new Huffman(ChatChannel.archive10.takeFileByNames("huffman", "")); // L: 2369 + ItemLayer.method4108(var0); // L: 2370 + Login.Login_loadingText = "Loaded wordpack"; // L: 2371 + Login.Login_loadingPercent = 94; // L: 2372 + Client.titleLoadingStage = 130; // L: 2373 + } + } else if (Client.titleLoadingStage == 130) { // L: 2376 + if (!ParamComposition.archive3.isFullyLoaded()) { // L: 2377 + Login.Login_loadingText = "Loading interfaces - " + ParamComposition.archive3.loadPercent() * 4 / 5 + "%"; // L: 2378 + Login.Login_loadingPercent = 96; // L: 2379 + } else if (!class14.archive12.isFullyLoaded()) { // L: 2382 + Login.Login_loadingText = "Loading interfaces - " + (80 + class14.archive12.loadPercent() / 6) + "%"; // L: 2383 + Login.Login_loadingPercent = 96; // L: 2384 + } else if (!LoginScreenAnimation.archive13.isFullyLoaded()) { // L: 2387 + Login.Login_loadingText = "Loading interfaces - " + (96 + LoginScreenAnimation.archive13.loadPercent() / 50) + "%"; // L: 2388 + Login.Login_loadingPercent = 96; // L: 2389 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 2392 + Login.Login_loadingPercent = 98; // L: 2393 + Client.titleLoadingStage = 140; // L: 2394 + } + } else if (Client.titleLoadingStage == 140) { // L: 2397 + Login.Login_loadingPercent = 100; // L: 2398 + if (!class111.archive19.tryLoadGroupByName(WorldMapCacheName.field2210.name)) { // L: 2399 + Login.Login_loadingText = "Loading world map - " + class111.archive19.groupLoadPercentByName(WorldMapCacheName.field2210.name) / 10 + "%"; // L: 2400 + } else { + if (class133.worldMap == null) { // L: 2403 + class133.worldMap = new WorldMap(); // L: 2404 + class133.worldMap.init(class111.archive19, Messages.archive18, GrandExchangeOfferOwnWorldComparator.archive20, Login.fontBold12, Client.fontsMap, TriBool.mapSceneSprites); // L: 2405 + } + + Login.Login_loadingText = "Loaded world map"; // L: 2407 + Client.titleLoadingStage = 150; // L: 2408 + } + } else if (Client.titleLoadingStage == 150) { // L: 2411 + WorldMapData_1.updateGameState(10); // L: 2412 + } } } - - if (var1 == 22) { - var3 = new AttackOption[]{AttackOption.field1234, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.field1237}; - Client.npcAttackOption = (AttackOption)class128.findEnumerated(var3, var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - } - } + } // L: 2009 2015 2041 2068 2088 2119 2136 2145 2178 2184 2190 2288 2317 2329 2335 2341 2348 2353 2361 2367 2374 2380 2385 2390 2395 2401 2409 2413 2415 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 99cf03a2e4..a46458f747 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,39 +3,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nv") +@ObfuscatedName("ns") @Implements("Node") public class Node { - @ObfuscatedName("fa") + @ObfuscatedName("ff") @Export("key") public long key; - @ObfuscatedName("fq") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("previous") public Node previous; - @ObfuscatedName("fe") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("next") public Node next; - @ObfuscatedName("ep") + @ObfuscatedName("ft") @Export("remove") public void remove() { - if (this.next != null) { - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; + 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 } - } + } // L: 14 - @ObfuscatedName("en") + @ObfuscatedName("fl") @Export("hasNext") public boolean hasNext() { - return this.next != null; + return this.next != null; // L: 17 } } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index dc344250c9..dbbd4457cc 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,181 +3,181 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("kn") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("current") Node current; public NodeDeque() { - this.sentinel = new Node(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Node(); // L: 6 + this.sentinel.previous = this.sentinel; // L: 10 + this.sentinel.next = this.sentinel; // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("clear") public void clear() { while (true) { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return; + Node var1 = this.sentinel.previous; // L: 16 + if (var1 == this.sentinel) { // L: 17 + this.current = null; // L: 20 + return; // L: 21 } - var1.remove(); + var1.remove(); // L: 18 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lns;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 24 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lns;)V" ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 32 var1.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; - } + 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 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("removeLast") public Node removeLast() { - Node var1 = this.sentinel.previous; + Node var1 = this.sentinel.previous; // L: 48 if (var1 == this.sentinel) { - return null; + return null; // L: 49 } else { - var1.remove(); - return var1; + var1.remove(); // L: 50 + return var1; // L: 51 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("removeFirst") public Node removeFirst() { - Node var1 = this.sentinel.next; + Node var1 = this.sentinel.next; // L: 55 if (var1 == this.sentinel) { - return null; + return null; // L: 56 } else { - var1.remove(); - return var1; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "()Lnv;" - ) - @Export("last") - public Node last() { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return null; - } else { - this.current = var1.previous; - return var1; - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "()Lnv;" - ) - @Export("first") - public Node first() { - Node var1 = this.sentinel.next; - if (var1 == this.sentinel) { - this.current = null; - return null; - } else { - this.current = var1.next; - return var1; + var1.remove(); // L: 57 + return var1; // L: 58 } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) - @Export("previous") - public Node previous() { - Node var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + @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 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 67 + return var1; // L: 68 } } - @ObfuscatedName("i") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) - @Export("next") - public Node next() { - Node var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + @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 } else { - this.current = var1.next; - return var1; + this.current = var1.next; // L: 77 + return var1; // L: 78 } } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnv;Lnv;)V" + descriptor = "()Lns;" + ) + @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 + } else { + this.current = var1.previous; // L: 87 + return var1; // L: 88 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "()Lns;" + ) + @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 + } else { + this.current = var1.next; // L: 97 + return var1; // L: 98 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lns;Lns;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { + if (var0.next != null) { // L: 40 var0.remove(); } - var0.next = var1.next; - var0.previous = var1; - var0.next.previous = var0; - var0.previous.next = var0; - } + 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 } diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index f289d32f14..6f26583628 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,117 +3,117 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ni") +@ObfuscatedName("nq") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("size") int size; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lnv;" + descriptor = "[Lns;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lns;" ) @Export("current") Node current; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("index") int index; public NodeHashTable(int var1) { - this.index = 0; - this.size = var1; - this.buckets = new Node[var1]; + this.index = 0; // L: 10 + this.size = var1; // L: 13 + this.buckets = new Node[var1]; // L: 14 - for (int var2 = 0; var2 < var1; ++var2) { - Node var3 = this.buckets[var2] = new Node(); - var3.previous = var3; - var3.next = var3; + 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 } - } + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(J)Lnv;" + descriptor = "(J)Lns;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 - 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; + 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 } } - this.currentGet = null; - return null; + this.currentGet = null; // L: 33 + return null; // L: 34 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lnv;J)V" + descriptor = "(Lns;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { + if (var1.next != null) { // L: 38 var1.remove(); } - 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; - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 48 + return this.next(); // L: 49 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lnv;" + descriptor = "()Lns;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { - var1 = this.current; - this.current = var1.previous; - return var1; + 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 } else { do { - if (this.index >= this.size) { - return null; + if (this.index >= this.size) { // L: 58 + return null; // L: 65 } - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + var1 = this.buckets[this.index++].previous; // L: 59 + } while(var1 == this.buckets[this.index - 1]); // L: 60 - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 61 + return var1; // L: 62 } } } diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index cb63b47356..5111222413 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -4,942 +4,958 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fe") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("tg") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("q") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("f") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("j") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lgi;" + descriptor = "[Lgk;" ) - static ModelData[] field1830; - @ObfuscatedName("nh") + static ModelData[] field1829; + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = -496958309 + intValue = 1556110033 ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("e") + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1967132325 + intValue = 266284433 ) @Export("id") public int id; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("modelIds") int[] modelIds; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("models") int[] models; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("name") public String name; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -52448415 + intValue = -665807275 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2087941395 + intValue = -1733890263 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2102964255 + intValue = 272562169 ) @Export("interactType") public int interactType; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1466223365 + intValue = -1426026863 ) @Export("int1") public int int1; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 779332633 + intValue = -9261121 ) @Export("clipType") int clipType; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1366637979 + intValue = 1497625237 ) @Export("animationId") public int animationId; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 185149677 + intValue = -596788999 ) @Export("int2") public int int2; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 29012483 + intValue = -1818556987 ) @Export("ambient") int ambient; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1186950665 + intValue = -1437223427 ) @Export("contrast") int contrast; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("actions") public String[] actions; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 882792935 + intValue = 105622053 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ah") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 327823803 + intValue = 1499014717 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("isRotated") boolean isRotated; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("clipped") public boolean clipped; - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1641704529 + intValue = -1770929887 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1726351319 + intValue = -525186249 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 190251917 + intValue = -353925583 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -2136514037 + intValue = 604005373 ) @Export("offsetX") int offsetX; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -485262707 + intValue = 891272171 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -2108867747 + intValue = 1846835585 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ac") + @ObfuscatedName("ar") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1016327393 + intValue = 1647220279 ) @Export("int3") public int int3; - @ObfuscatedName("an") + @ObfuscatedName("ax") @Export("transforms") public int[] transforms; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 361978407 + intValue = 1979893859 ) @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 510021155 + intValue = -345965795 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1633303267 + intValue = -19154525 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("am") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1584485603 + intValue = 914150453 ) @Export("int7") public int int7; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -2032112943 + intValue = 1201364109 ) @Export("int5") public int int5; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -357023419 + intValue = 1369348295 ) @Export("int6") public int int6; - @ObfuscatedName("ae") + @ObfuscatedName("ao") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("params") IterableNodeHashTable params; static { - ObjectDefinition_isLowDetail = false; - ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); - ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); - ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); - ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field1830 = new ModelData[4]; + 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 + field1829 = new ModelData[4]; // L: 24 } ObjectComposition() { - 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; - this.mapSceneId = -1; - 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; - this.transformVarp = -1; - this.ambientSoundId = -1; - this.int7 = 0; - this.int5 = 0; - this.int6 = 0; - this.boolean3 = true; - } + 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.contrast = 0; // L: 44 + this.actions = new String[5]; // L: 45 + this.mapIconId = -1; // L: 46 + this.mapSceneId = -1; // L: 47 + 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.isSolid = false; // L: 57 + this.int3 = -1; // L: 58 + 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 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1078015676" + garbageValue = "2109950793" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { - this.int1 = 0; - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { + if (this.int1 == -1) { // L: 89 + this.int1 = 0; // L: 90 + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 91 this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { + for (int var1 = 0; var1 < 5; ++var1) { // L: 92 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { + if (this.int3 == -1) { // L: 94 this.int3 = this.interactType != 0 ? 1 : 0; } - } + } // L: 95 - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "2001330401" + descriptor = "(Lop;I)V", + garbageValue = "-1851511253" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 99 + if (var2 == 0) { // L: 100 + return; // L: 103 } - this.decodeNext(var1, var2); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "37" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - int var3; - int var4; - if (var2 == 1) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 3 * var3; - } else { - this.models = new int[var3]; - this.modelIds = new int[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); - this.models[var4] = var1.readUnsignedByte(); - } - } - } - } else if (var2 == 2) { - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 2; - } else { - this.models = null; - this.modelIds = new int[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); - } - } - } - } else if (var2 == 14) { - this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { - this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { - this.interactType = 0; - this.boolean1 = false; - } else if (var2 == 18) { - this.boolean1 = false; - } else if (var2 == 19) { - this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { - this.clipType = 0; - } else if (var2 == 22) { - this.nonFlatShading = true; - } else if (var2 == 23) { - this.modelClipped = true; - } else if (var2 == 24) { - this.animationId = var1.readUnsignedShort(); - if (this.animationId == 65535) { - this.animationId = -1; - } - } else if (var2 == 27) { - this.interactType = 1; - } else if (var2 == 28) { - this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { - this.ambient = var1.readByte(); - } else if (var2 == 39) { - this.contrast = var1.readByte() * 25; - } 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) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 61) { - var1.readUnsignedShort(); - } else if (var2 == 62) { - this.isRotated = true; - } else if (var2 == 64) { - this.clipped = false; - } else if (var2 == 65) { - this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { - this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { - this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { - this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { - var1.readUnsignedByte(); - } else if (var2 == 70) { - this.offsetX = var1.readShort(); - } else if (var2 == 71) { - this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { - this.offsetY = var1.readShort(); - } else if (var2 == 73) { - this.boolean2 = true; - } else if (var2 == 74) { - this.isSolid = true; - } else if (var2 == 75) { - this.int3 = var1.readUnsignedByte(); - } 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) { - this.soundEffectIds[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 81) { - this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { - this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { - this.boolean3 = false; - } else if (var2 == 249) { - this.params = KeyHandler.readStringIntParameters(var1, this.params); - } - } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { - this.transformVarp = -1; - } - - var3 = -1; - if (var2 == 92) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { - var3 = -1; - } - } - - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; - - 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; - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1929847726" - ) - public final boolean method3213(int var1) { - if (this.models != null) { - for (int var4 = 0; var4 < this.models.length; ++var4) { - if (this.models[var4] == var1) { - return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); - } - } - - return true; - } else if (this.modelIds == null) { - return true; - } else if (var1 != 10) { - return true; - } else { - boolean var2 = true; - - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); - } - - return var2; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1982910394" - ) - @Export("needsModelFiles") - public final boolean needsModelFiles() { - if (this.modelIds == null) { - return true; - } else { - boolean var1 = true; - - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); - } - - return var1; + this.decodeNext(var1, var2); // L: 101 } } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lhi;", - garbageValue = "610598122" + descriptor = "(Lop;IB)V", + garbageValue = "100" ) - @Export("getEntity") - public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { - long var7; - if (this.models == null) { - var7 = (long)(var2 + (this.id << 10)); + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + int var3; + int var4; + if (var2 == 1) { // L: 106 + var3 = var1.readUnsignedByte(); // L: 107 + if (var3 > 0) { // L: 108 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109 + var1.offset += var3 * 3; // L: 117 + } else { + this.models = new int[var3]; // L: 110 + this.modelIds = new int[var3]; // L: 111 + + for (var4 = 0; var4 < var3; ++var4) { // L: 112 + this.modelIds[var4] = var1.readUnsignedShort(); // L: 113 + this.models[var4] = var1.readUnsignedByte(); // L: 114 + } + } + } + } else if (var2 == 2) { // L: 120 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 5) { // L: 121 + var3 = var1.readUnsignedByte(); // L: 122 + if (var3 > 0) { // L: 123 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124 + var1.offset += 2 * var3; // L: 129 + } else { + this.models = null; // L: 125 + this.modelIds = new int[var3]; // L: 126 + + for (var4 = 0; var4 < var3; ++var4) { // L: 127 + this.modelIds[var4] = var1.readUnsignedShort(); + } + } + } + } else if (var2 == 14) { // L: 132 + this.sizeX = var1.readUnsignedByte(); + } else if (var2 == 15) { // L: 133 + this.sizeY = var1.readUnsignedByte(); + } else if (var2 == 17) { // L: 134 + this.interactType = 0; // L: 135 + this.boolean1 = false; // L: 136 + } else if (var2 == 18) { // L: 138 + this.boolean1 = false; + } else if (var2 == 19) { // L: 139 + this.int1 = var1.readUnsignedByte(); + } else if (var2 == 21) { // L: 140 + this.clipType = 0; + } else if (var2 == 22) { // L: 141 + this.nonFlatShading = true; + } else if (var2 == 23) { // L: 142 + this.modelClipped = true; + } else if (var2 == 24) { // L: 143 + this.animationId = var1.readUnsignedShort(); // L: 144 + if (this.animationId == 65535) { // L: 145 + this.animationId = -1; + } + } else if (var2 == 27) { // L: 147 + this.interactType = 1; + } else if (var2 == 28) { // L: 148 + this.int2 = var1.readUnsignedByte(); + } else if (var2 == 29) { // L: 149 + this.ambient = var1.readByte(); + } else if (var2 == 39) { // L: 150 + this.contrast = var1.readByte() * 25; + } else if (var2 >= 30 && var2 < 35) { // L: 151 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 152 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 153 + this.actions[var2 - 30] = null; + } + } else if (var2 == 40) { // L: 155 + var3 = var1.readUnsignedByte(); // L: 156 + this.recolorFrom = new short[var3]; // L: 157 + this.recolorTo = new short[var3]; // L: 158 + + for (var4 = 0; var4 < var3; ++var4) { // L: 159 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 160 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 161 + } + } else if (var2 == 41) { // L: 164 + var3 = var1.readUnsignedByte(); // L: 165 + this.retextureFrom = new short[var3]; // L: 166 + this.retextureTo = new short[var3]; // L: 167 + + for (var4 = 0; var4 < var3; ++var4) { // L: 168 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 169 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 170 + } + } else if (var2 == 61) { // L: 173 + var1.readUnsignedShort(); // L: 174 + } else if (var2 == 62) { // L: 176 + this.isRotated = true; + } else if (var2 == 64) { // L: 177 + this.clipped = false; + } else if (var2 == 65) { // L: 178 + this.modelSizeX = var1.readUnsignedShort(); + } else if (var2 == 66) { // L: 179 + this.modelHeight = var1.readUnsignedShort(); + } else if (var2 == 67) { // L: 180 + this.modelSizeY = var1.readUnsignedShort(); + } else if (var2 == 68) { // L: 181 + this.mapSceneId = var1.readUnsignedShort(); + } else if (var2 == 69) { // L: 182 + var1.readUnsignedByte(); // L: 183 + } else if (var2 == 70) { // L: 185 + this.offsetX = var1.readShort(); + } else if (var2 == 71) { // L: 186 + this.offsetHeight = var1.readShort(); + } else if (var2 == 72) { + this.offsetY = var1.readShort(); // L: 187 + } else if (var2 == 73) { // L: 188 + this.boolean2 = true; + } else if (var2 == 74) { // L: 189 + this.isSolid = true; + } else if (var2 == 75) { // L: 190 + this.int3 = var1.readUnsignedByte(); + } else if (var2 != 77 && var2 != 92) { // L: 191 + if (var2 == 78) { // L: 209 + this.ambientSoundId = var1.readUnsignedShort(); // L: 210 + this.int7 = var1.readUnsignedByte(); // L: 211 + } else if (var2 == 79) { // L: 213 + this.int5 = var1.readUnsignedShort(); // L: 214 + this.int6 = var1.readUnsignedShort(); // L: 215 + this.int7 = var1.readUnsignedByte(); // L: 216 + var3 = var1.readUnsignedByte(); // L: 217 + this.soundEffectIds = new int[var3]; // L: 218 + + for (var4 = 0; var4 < var3; ++var4) { // L: 219 + this.soundEffectIds[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 81) { // L: 221 + this.clipType = var1.readUnsignedByte() * 256; + } else if (var2 == 82) { // L: 222 + this.mapIconId = var1.readUnsignedShort(); + } else if (var2 == 89) { // L: 223 + this.boolean3 = false; + } else if (var2 == 249) { // L: 224 + this.params = class13.readStringIntParameters(var1, this.params); + } } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); - } - - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); - if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); - if (var10 == null) { - return null; + this.transformVarbit = var1.readUnsignedShort(); // L: 192 + if (this.transformVarbit == 65535) { // L: 193 + this.transformVarbit = -1; } - if (!this.nonFlatShading) { - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - } else { - var10.ambient = (short)(this.ambient + 64); - var10.contrast = (short)(this.contrast + 768); - var10.calculateVertexNormals(); - var9 = var10; + this.transformVarp = var1.readUnsignedShort(); // L: 194 + if (this.transformVarp == 65535) { // L: 195 + this.transformVarp = -1; } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); - } - - if (this.nonFlatShading) { - var9 = ((ModelData)var9).method4028(); - } - - 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).method4083(var3, var4, var5, var6, true, this.clipType); + var3 = -1; // L: 196 + if (var2 == 92) { // L: 197 + var3 = var1.readUnsignedShort(); // L: 198 + if (var3 == 65535) { // L: 199 + var3 = -1; + } } + + var4 = var1.readUnsignedByte(); // L: 201 + this.transforms = new int[var4 + 2]; // L: 202 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 203 + this.transforms[var5] = var1.readUnsignedShort(); // L: 204 + if (this.transforms[var5] == 65535) { // L: 205 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 207 } - return (Renderable)var9; + } // L: 226 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1619407121" + ) + public final boolean method3305(int var1) { + if (this.models != null) { // L: 229 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 239 + if (this.models[var4] == var1) { // L: 240 + return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); + } + } + + return true; // L: 242 + } else if (this.modelIds == null) { // L: 230 + return true; + } else if (var1 != 10) { // L: 231 + return true; + } else { + boolean var2 = true; // L: 232 + + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 233 + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 234 + } + + return var2; // L: 236 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1274687843" + ) + @Export("needsModelFiles") + public final boolean needsModelFiles() { + if (this.modelIds == null) { // L: 247 + return true; + } else { + boolean var1 = true; // L: 248 + + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 249 + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 250 + } + + return var1; // L: 252 + } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lhl;", - garbageValue = "144741058" + descriptor = "(II[[IIIIB)Lhj;", + garbageValue = "27" + ) + @Export("getEntity") + public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + long var7; + if (this.models == null) { // L: 257 + var7 = (long)(var2 + (this.id << 10)); + } else { + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 258 + } + + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 259 + if (var9 == null) { // L: 260 + ModelData var10 = this.getModelData(var1, var2); // L: 261 + if (var10 == null) { // L: 262 + return null; + } + + if (!this.nonFlatShading) { // L: 263 + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + } else { + var10.ambient = (short)(this.ambient + 64); // L: 265 + var10.contrast = (short)(this.contrast + 768); // L: 266 + var10.calculateVertexNormals(); // L: 267 + var9 = var10; // L: 268 + } + + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 270 + } + + if (this.nonFlatShading) { // L: 272 + var9 = ((ModelData)var9).method4115(); // L: 273 + } + + if (this.clipType >= 0) { // L: 275 + if (var9 instanceof Model) { // L: 276 + var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); + } else if (var9 instanceof ModelData) { + var9 = ((ModelData)var9).method4135(var3, var4, var5, var6, true, this.clipType); // L: 277 + } + } + + return (Renderable)var9; // L: 279 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II[[IIIIB)Lhl;", + garbageValue = "66" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { + if (this.models == null) { // L: 284 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 285 } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); - if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); - if (var10 == null) { + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 286 + if (var9 == null) { // L: 287 + ModelData var10 = this.getModelData(var1, var2); // L: 288 + if (var10 == null) { // L: 289 return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var9, var7); + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 290 + ObjectDefinition_cachedModels.put(var9, var7); // L: 291 } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 293 } - return var9; + return var9; // L: 294 } - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II[[IIIILfe;IB)Lhl;", - garbageValue = "38" + descriptor = "(II[[IIIILfm;IB)Lhl;", + garbageValue = "-55" ) @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) { + if (this.models == null) { // L: 299 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 300 } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); - if (var11 == null) { - ModelData var12 = this.getModelData(var1, var2); - if (var12 == null) { + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 301 + if (var11 == null) { // L: 302 + ModelData var12 = this.getModelData(var1, var2); // L: 303 + if (var12 == null) { // L: 304 return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var11, var9); + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 305 + ObjectDefinition_cachedModels.put(var11, var9); // L: 306 } - if (var7 == null && this.clipType == -1) { + if (var7 == null && this.clipType == -1) { // L: 308 return var11; } else { - if (var7 != null) { + if (var7 != null) { // L: 309 var11 = var7.transformObjectModel(var11, var8, var2); } else { - var11 = var11.toSharedSequenceModel(true); + var11 = var11.toSharedSequenceModel(true); // L: 310 } - if (this.clipType >= 0) { + if (this.clipType >= 0) { // L: 311 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; + return var11; // L: 312 } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lgi;", - garbageValue = "739180603" + descriptor = "(III)Lgk;", + garbageValue = "1425580449" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; + ModelData var3 = null; // L: 316 boolean var4; int var5; int var7; - if (this.models == null) { - if (var1 != 10) { + if (this.models == null) { // L: 317 + if (var1 != 10) { // L: 318 return null; } - if (this.modelIds == null) { + if (this.modelIds == null) { // L: 319 return null; } - var4 = this.isRotated; - if (var1 == 2 && var2 > 3) { + var4 = this.isRotated; // L: 320 + if (var1 == 2 && var2 > 3) { // L: 321 var4 = !var4; } - var5 = this.modelIds.length; + var5 = this.modelIds.length; // L: 322 - for (int var6 = 0; var6 < var5; ++var6) { - var7 = this.modelIds[var6]; - if (var4) { + for (int var6 = 0; var6 < var5; ++var6) { // L: 323 + var7 = this.modelIds[var6]; // L: 324 + if (var4) { // L: 325 var7 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); - if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); - if (var3 == null) { + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 326 + if (var3 == null) { // L: 327 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 328 + if (var3 == null) { // L: 329 return null; } - if (var4) { - var3.method4038(); + if (var4) { // L: 330 + var3.method4125(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 331 } - if (var5 > 1) { - field1830[var6] = var3; + if (var5 > 1) { // L: 333 + field1829[var6] = var3; } } - if (var5 > 1) { - var3 = new ModelData(field1830, var5); + if (var5 > 1) { // L: 335 + var3 = new ModelData(field1829, var5); } } else { - int var9 = -1; + int var9 = -1; // L: 338 - for (var5 = 0; var5 < this.models.length; ++var5) { - if (this.models[var5] == var1) { - var9 = var5; + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 339 + if (this.models[var5] == var1) { // L: 340 + var9 = var5; // L: 341 break; } } - if (var9 == -1) { + if (var9 == -1) { // L: 345 return null; } - var5 = this.modelIds[var9]; - boolean var10 = this.isRotated ^ var2 > 3; - if (var10) { + var5 = this.modelIds[var9]; // L: 346 + boolean var10 = this.isRotated ^ var2 > 3; // L: 347 + if (var10) { // L: 348 var5 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); - if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); - if (var3 == null) { + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 349 + if (var3 == null) { // L: 350 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 351 + if (var3 == null) { // L: 352 return null; } - if (var10) { - var3.method4038(); + if (var10) { // L: 353 + var3.method4125(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 354 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { - var4 = false; + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 358 + var4 = false; // L: 359 } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { - var11 = false; + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 361 + var11 = false; // L: 362 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); - if (var1 == 4 && var2 > 3) { - var8.method4034(256); - var8.changeOffset(45, 0, -45); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 363 + if (var1 == 4 && var2 > 3) { // L: 364 + var8.method4111(256); // L: 365 + var8.changeOffset(45, 0, -45); // L: 366 } - var2 &= 3; - if (var2 == 1) { - var8.method4031(); - } else if (var2 == 2) { - var8.method4032(); - } else if (var2 == 3) { - var8.method4033(); + var2 &= 3; // L: 368 + if (var2 == 1) { // L: 369 + var8.method4158(); + } else if (var2 == 2) { // L: 370 + var8.method4119(); + } else if (var2 == 3) { // L: 371 + var8.method4120(); } - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + if (this.recolorFrom != null) { // L: 372 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 373 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 374 } } - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + if (this.retextureFrom != null) { // L: 377 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 378 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 379 } } - if (var4) { + if (var4) { // L: 382 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { + if (var11) { // L: 383 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; + return var8; // L: 384 } - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)Lfo;", - garbageValue = "3" + descriptor = "(B)Lfe;", + garbageValue = "13" ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Varcs.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 388 + if (this.transformVarbit != -1) { // L: 389 + var1 = class119.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 390 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 392 + var2 = this.transforms[var1]; // L: 393 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class245.getObjectDefinition(var2) : null; + return var2 != -1 ? KitDefinition.getObjectDefinition(var2) : null; // L: 394 395 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-9471" + descriptor = "(III)I", + garbageValue = "778921669" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return NPC.method2251(this.params, var1, var2); // L: 399 } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-25" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "-26105" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return VarbitComposition.method3205(this.params, var1, var2); // L: 403 } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "7" + descriptor = "(I)Z", + garbageValue = "-1495997544" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 414 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { - if (this.transforms[var1] != -1) { - ObjectComposition var2 = class245.getObjectDefinition(this.transforms[var1]); - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 415 + if (this.transforms[var1] != -1) { // L: 416 + ObjectComposition var2 = KitDefinition.getObjectDefinition(this.transforms[var1]); // L: 417 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 418 return true; } } } - return false; + return false; // L: 421 } } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(CS)Z", + garbageValue = "18256" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 162 + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(Ljf;Lff;IIZI)V", + garbageValue = "-1079376005" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10448 + byte var6 = -1; // L: 10449 + String var7 = null; // L: 10450 + if (var5 != null && var5[var3] != null) { // L: 10451 + if (var3 == 0) { // L: 10452 + var6 = 33; + } else if (var3 == 1) { // L: 10453 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 10454 + } else if (var3 == 3) { // L: 10455 + var6 = 36; + } else { + var6 = 37; // L: 10456 + } + + var7 = var5[var3]; // L: 10457 + } else if (var3 == 4) { // L: 10460 + var6 = 37; // L: 10461 + var7 = "Drop"; // L: 10462 + } + + if (var6 != -1 && var7 != null) { // L: 10465 + ModelData0.insertMenuItem(var7, MouseHandler.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10466 + } + + } // L: 10468 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index be1f609cfa..bb83f679cc 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nn") +@ObfuscatedName("nh") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("obj") public final Object obj; public ObjectNode(Object var1) { - this.obj = var1; - } + this.obj = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index b0b6b57673..d3793c024a 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,214 +1,377 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("br") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 12452185 + intValue = -1369151761 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1536364883 + intValue = -820509613 + ) + int field767; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 933801989 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1658207689 + intValue = -215846053 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1738796741 + intValue = 171593 ) - int field807; - @ObfuscatedName("k") + int field771; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1807311773 + intValue = -269879271 ) - int field803; - @ObfuscatedName("t") + int field772; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -568523691 + intValue = -1161490471 ) - int field804; - @ObfuscatedName("a") + int field773; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -908511827 + intValue = -588798073 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lax;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -623249431 + intValue = -418020261 ) - int field808; + int field776; @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1245804267 - ) - int field809; - @ObfuscatedName("w") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2138886061 + intValue = -668144329 ) - int field811; - @ObfuscatedName("v") + int field779; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lax;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfe;" ) @Export("obj") ObjectComposition obj; static { - objectSounds = new NodeDeque(); + objectSounds = new NodeDeque(); // L: 11 } ObjectSound() { - } + } // L: 27 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "926767071" + garbageValue = "1086941780" ) @Export("set") void set() { int var1 = this.soundEffectId; ObjectComposition var2 = this.obj.transform(); if (var2 != null) { - this.soundEffectId = var2.ambientSoundId; - this.field804 = var2.int7 * 128; - this.field808 = var2.int5; - this.field809 = var2.int6; + this.soundEffectId = var2.ambientSoundId; // L: 39 + this.field773 = var2.int7 * 128; // L: 40 + this.field767 = var2.int5; + this.field776 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field804 = 0; - this.field808 = 0; - this.field809 = 0; + this.field773 = 0; + this.field767 = 0; + this.field776 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(this.stream1); + BuddyRankComparator.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2044677367" + descriptor = "(II)Lfd;", + garbageValue = "1754222612" ) - protected static final void method1719() { - LoginPacket.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.graphicsTickTimes[var0] = 0L; - } - - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.clientTickTimes[var0] = 0L; - } - - GameEngine.gameCyclesToDo = 0; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-2053759056" - ) - static int method1730(int var0, Script var1, boolean var2) { - 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) { - --class54.Interpreter_stringStackSize; - return 1; - } else if (var0 != 7036 && var0 != 7037) { - if (var0 == 7038) { - --AbstractByteArrayCopier.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 { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } - } else { - --class54.Interpreter_stringStackSize; - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } - } else { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - return 1; - } + public static HealthBarDefinition method1772(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 5; - return 1; + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 + var1 = new HealthBarDefinition(); // L: 35 + if (var2 != null) { // L: 36 + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37 + return var1; } } - @ObfuscatedName("kj") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljt;B)Z", - garbageValue = "-105" + descriptor = "(IIII)Lbp;", + garbageValue = "1477696022" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = LoginScreenAnimation.method2220(var1, var0); // L: 38 + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41 + Script var4; + if (var5 != null) { // L: 42 + var4 = var5; // L: 43 + } else { + String var6 = String.valueOf(var3); // L: 46 + int var7 = class14.archive12.getGroupId(var6); // L: 47 + if (var7 == -1) { + var4 = null; + } else { + label59: { + byte[] var8 = class14.archive12.takeFileFlat(var7); // L: 52 + if (var8 != null) { // L: 53 + if (var8.length <= 1) { // L: 54 + var4 = null; // L: 55 + break label59; // L: 56 + } + + var5 = class87.newScript(var8); // L: 58 + if (var5 != null) { // L: 59 + Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60 + var4 = var5; // L: 61 + break label59; // L: 62 + } + } + + var4 = null; // L: 65 + } + } + } + + if (var4 != null) { // L: 68 + return var4; // L: 69 + } else { + int var12 = (-3 - var2 << 8) + var0; // L: 73 + Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 78 + Script var13; + if (var14 != null) { // L: 79 + var13 = var14; // L: 80 + } else { + String var9 = String.valueOf(var12); + int var10 = class14.archive12.getGroupId(var9); + if (var10 == -1) { + var13 = null; + } else { + byte[] var11 = class14.archive12.takeFileFlat(var10); + if (var11 != null) { // L: 90 + if (var11.length <= 1) { + var13 = null; + return var13 != null ? var13 : null; // L: 108 + } + + var14 = class87.newScript(var11); + if (var14 != null) { + Script.Script_cached.put(var14, (long)(var12 << 16)); + var13 = var14; // L: 98 + return var13 != null ? var13 : null; + } + } + + var13 = null; + } + } + + return var13 != null ? var13 : null; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Lbw;II[I[II)V", + garbageValue = "1465012672" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { // L: 81 + int var5 = var1 - 1; // L: 82 + int var6 = var2 + 1; // L: 83 + int var7 = (var2 + var1) / 2; // L: 84 + World var8 = var0[var7]; // L: 85 + var0[var7] = var0[var1]; // L: 86 + var0[var1] = var8; // L: 87 + + while (var5 < var6) { // L: 88 + boolean var9 = true; // L: 89 + + int var10; + int var11; + int var12; + do { + --var6; // L: 91 + + for (var10 = 0; var10 < 4; ++var10) { // L: 92 + if (var3[var10] == 2) { // L: 95 + var11 = var0[var6].index; // L: 96 + var12 = var8.index; // L: 97 + } else if (var3[var10] == 1) { // L: 99 + var11 = var0[var6].population; // L: 100 + var12 = var8.population; // L: 101 + if (var11 == -1 && var4[var10] == 1) { // L: 102 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 103 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 105 + var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 + } else { + var11 = var0[var6].id; // L: 110 + var12 = var8.id; // L: 111 + } + + if (var11 != var12) { // L: 113 + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 + var9 = false; // L: 119 + } + break; + } + + if (var10 == 3) { // L: 114 + var9 = false; + } + } + } while(var9); + + var9 = true; // L: 124 + + do { + ++var5; // L: 126 + + for (var10 = 0; var10 < 4; ++var10) { // L: 127 + if (var3[var10] == 2) { // L: 130 + var11 = var0[var5].index; // L: 131 + var12 = var8.index; // L: 132 + } else if (var3[var10] == 1) { // L: 134 + var11 = var0[var5].population; // L: 135 + var12 = var8.population; // L: 136 + if (var11 == -1 && var4[var10] == 1) { // L: 137 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 138 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 140 + var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 + } else { + var11 = var0[var5].id; // L: 145 + var12 = var8.id; // L: 146 + } + + if (var12 != var11) { // L: 148 + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 + var9 = false; // L: 154 + } + break; + } + + if (var10 == 3) { // L: 149 + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 + } + } + + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + } + + } // L: 168 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)[B", + garbageValue = "34" + ) + public static byte[] method1771() { + byte[] var0 = new byte[24]; // L: 277 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 279 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 280 + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 281 282 283 + } + + if (var1 >= 24) { + throw new IOException(); // L: 285 + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 288 + var0[var2] = -1; + } + } + + return var0; // L: 290 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1222610870" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 48 + return var1 == null ? 0 : var1.size(); // L: 49 50 } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 3228fc0868..94dd9fdb4b 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,113 +1,291 @@ +import java.applet.Applet; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("hp") +@ObfuscatedName("hw") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1719542493 + intValue = -1749152531 ) @Export("minTileX") int minTileX; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1789010699 + intValue = 883383741 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1557432233 + intValue = 1136190305 ) @Export("minTileY") int minTileY; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 817292531 + intValue = 678309221 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 400749645 + intValue = -319994583 ) @Export("type") int type; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 502654349 + intValue = -1416943749 ) @Export("minX") int minX; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -873671995 + intValue = -1076426543 ) @Export("maxX") int maxX; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -922941329 + intValue = -287892181 ) @Export("minZ") int minZ; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1363675319 + intValue = 2065946253 ) @Export("maxZ") int maxZ; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 468546867 + intValue = -300779215 ) @Export("minY") int minY; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1571319031 + intValue = -1201693205 ) @Export("maxY") int maxY; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1978554207 + intValue = 816323749 ) - int field2466; - @ObfuscatedName("g") + int field2464; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1028665229 - ) - int field2467; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1892876933 - ) - int field2468; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 791479165 + intValue = -1338658645 ) int field2469; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1288534623 - ) - int field2470; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1161578073 + intValue = -761560275 ) int field2463; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 312083711 + intValue = 1793637339 + ) + int field2471; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1091401787 + ) + int field2470; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1237604195 + ) + int field2473; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -559031051 ) int field2472; Occluder() { + } // L: 23 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Lju;", + garbageValue = "1814694549" + ) + public static class283[] method4483() { + return new class283[]{class283.field3639, class283.field3638, class283.field3640, class283.field3637}; // L: 15 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "466419387" + ) + static boolean method4484(String var0) { + if (var0 == null) { // L: 191 + return false; + } else { + try { + new URL(var0); + return true; // L: 198 + } catch (MalformedURLException var2) { // L: 195 + return false; // L: 196 + } + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "2027201546" + ) + static boolean method4485(String var0, int var1, String var2) { + if (var1 == 0) { // L: 59 + try { + if (!class29.field158.startsWith("win")) { // L: 61 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 62 + throw new Exception(); + } else { + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 63 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 64 + if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 65 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 67 + return true; // L: 68 + } + } catch (Throwable var5) { // L: 70 + return false; // L: 71 + } + } else if (var1 == 1) { // L: 74 + try { + Object var10 = class27.method394(class29.field157, var2, new Object[]{(new URL(class29.field157.getCodeBase(), var0)).toString()}); // L: 76 + return var10 != null; // L: 77 + } catch (Throwable var6) { // L: 79 + return false; // L: 80 + } + } else if (var1 == 2) { // L: 83 + try { + class29.field157.getAppletContext().showDocument(new URL(class29.field157.getCodeBase(), var0), "_blank"); // L: 85 + return true; // L: 86 + } catch (Exception var7) { // L: 88 + return false; // L: 89 + } + } else if (var1 == 3) { // L: 92 + try { + Applet var3 = class29.field157; // L: 94 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 97 + } catch (Throwable var9) { // L: 100 + } + + try { + class29.field157.getAppletContext().showDocument(new URL(class29.field157.getCodeBase(), var0), "_top"); // L: 102 + return true; // L: 103 + } catch (Exception var8) { // L: 105 + return false; // L: 106 + } + } else { + throw new IllegalArgumentException(); // L: 109 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-20" + ) + static void method4482() { + Login.Login_username = Login.Login_username.trim(); // L: 908 + if (Login.Login_username.length() == 0) { // L: 909 + class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 910 + } else { + long var1 = SoundCache.method807(); // L: 914 + int var0; + if (0L == var1) { // L: 915 + var0 = 5; + } else { + var0 = class1.method15(var1, Login.Login_username); // L: 916 + } + + switch(var0) { // L: 917 + case 2: + class1.setLoginResponseString(Strings.field3595, Strings.field3634, Strings.field3597); // L: 928 + class275.method5201(6); // L: 929 + break; // L: 930 + case 3: + class1.setLoginResponseString("", "Error connecting to server.", ""); // L: 935 + break; + case 4: + class1.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 922 + break; // L: 923 + case 5: + class1.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 925 + break; // L: 926 + case 6: + class1.setLoginResponseString("", "Error connecting to server.", ""); // L: 919 + break; + case 7: + class1.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: 932 + } + + } + } // L: 911 938 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1873535602" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 595 + if (ClientPreferences.garbageCollector == null || !ClientPreferences.garbageCollector.isValid()) { // L: 596 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 598 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 599 + if (var2.isValid()) { // L: 601 + ClientPreferences.garbageCollector = var2; // L: 602 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 603 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 604 + } + } + } catch (Throwable var11) { // L: 609 + } + } + + if (ClientPreferences.garbageCollector != null) { // L: 611 + long var9 = class111.method2516(); // L: 612 + long var3 = ClientPreferences.garbageCollector.getCollectionTime(); // L: 613 + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 614 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 615 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 616 + if (var7 != 0L) { // L: 617 + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 619 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 620 + } + + return var0; // L: 622 } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 9cf0c2b5fb..d09160e3b5 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,157 +4,186 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oy") +@ObfuscatedName("oj") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("q") - static final int[] field4285; - @ObfuscatedName("l") + @ObfuscatedName("w") + static final int[] field4292; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpv;" + descriptor = "Lpw;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 699340495 + intValue = -1515692399 ) @Export("bitIndex") int bitIndex; static { - field4285 = 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}; + field4292 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 } public PacketBuffer(int var1) { - super(var1); - } + super(var1); // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-1448401984" + garbageValue = "1979297082" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { - this.isaacCipher = new IsaacCipher(var1); - } + this.isaacCipher = new IsaacCipher(var1); // L: 15 + } // L: 16 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lpv;S)V", - garbageValue = "30422" + descriptor = "(Lpw;I)V", + garbageValue = "-1209531146" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher = var1; - } + this.isaacCipher = var1; // L: 19 + } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "2" + descriptor = "(II)V", + garbageValue = "1992268724" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { - super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "952726655" - ) - @Export("readByteIsaac") - public int readByteIsaac() { - return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "25434" - ) - public boolean method6848() { - int var1 = super.array[super.offset] - this.isaacCipher.method7440() & 255; - return var1 >= 128; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "45" - ) - @Export("readSmartByteShortIsaac") - public int readSmartByteShortIsaac() { - 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("t") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1932587196" - ) - public void method6853(byte[] var1, int var2, int var3) { - for (int var4 = 0; var4 < var3; ++var4) { - var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); - } - - } + super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 + } // L: 24 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-8907389" + descriptor = "(B)I", + garbageValue = "-20" ) - @Export("importIndex") - public void importIndex() { - this.bitIndex = super.offset * 8; + @Export("readByteIsaac") + public int readByteIsaac() { + return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "28330" + ) + public boolean method6912() { + int var1 = super.array[super.offset] - this.isaacCipher.method7540() & 255; // L: 31 + return var1 >= 128; // L: 32 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2024952267" + ) + @Export("readSmartByteShortIsaac") + public int readSmartByteShortIsaac() { + int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "1132021347" + ) + public void method6939(byte[] var1, int var2, int var3) { + for (int var4 = 0; var4 < var3; ++var4) { // L: 43 + var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); + } + + } // L: 44 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1556588051" + ) + @Export("importIndex") + public void importIndex() { + this.bitIndex = super.offset * 8; // L: 47 + } // L: 48 + + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-308052507" + garbageValue = "2118631653" ) @Export("readBits") public int readBits(int var1) { - int var2 = this.bitIndex >> 3; - int var3 = 8 - (this.bitIndex & 7); - int var4 = 0; + int var2 = this.bitIndex >> 3; // L: 51 + int var3 = 8 - (this.bitIndex & 7); // L: 52 + int var4 = 0; // L: 53 - for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field4285[var3]) << var1 - var3; - var1 -= var3; + for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 + var4 += (super.array[var2++] & field4292[var3]) << var1 - var3; // L: 56 + var1 -= var3; // L: 57 } - if (var3 == var1) { - var4 += super.array[var2] & field4285[var3]; + if (var3 == var1) { // L: 60 + var4 += super.array[var2] & field4292[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4285[var1]; + var4 += super.array[var2] >> var3 - var1 & field4292[var1]; // L: 61 } - return var4; + return var4; // L: 62 } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1759118925" + descriptor = "(S)V", + garbageValue = "-12237" ) @Export("exportIndex") public void exportIndex() { - super.offset = (this.bitIndex + 7) / 8; - } + super.offset = (this.bitIndex + 7) / 8; // L: 66 + } // L: 67 - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "335509391" + descriptor = "(IB)I", + garbageValue = "-87" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; + return var1 * 8 - this.bitIndex; // L: 70 } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIZIB)J", + garbageValue = "-95" + ) + @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: 85 + if (var3) { // L: 86 + var5 |= 65536L; + } + + return var5; // L: 87 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-383007822" + ) + public static void method6913() { + class414.SpriteBuffer_xOffsets = null; // L: 259 + class414.SpriteBuffer_yOffsets = null; // L: 260 + UrlRequester.SpriteBuffer_spriteWidths = null; // L: 261 + class414.SpriteBuffer_spriteHeights = null; // L: 262 + HitSplatDefinition.SpriteBuffer_spritePalette = null; // L: 263 + class295.SpriteBuffer_pixels = null; // L: 264 + } // L: 265 } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 56b8779271..0a7b599839 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,95 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ib") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("sf") - @ObfuscatedGetter( - intValue = 1714569287 - ) - static int field2786; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lis;" + descriptor = "[Lib;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1923924179 + intValue = -1045179261 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -1453961237 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liz;" + descriptor = "Lik;" ) @Export("clientPacket") public ClientPacket clientPacket; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -215681187 + intValue = -881664177 ) @Export("clientPacketLength") public int clientPacketLength; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Loy;" + descriptor = "Loj;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1705067673 + intValue = 1172776223 ) @Export("index") public int index; static { - PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; - PacketBufferNode_packetBufferNodeCount = 0; + PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13 + PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } PacketBufferNode() { - } + } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1435986558" + garbageValue = "-1705967924" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 42 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 43 } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1167818871" - ) - public static boolean method4654(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field128[var0] : false; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-337771237" - ) - static void method4653(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } + } // L: 44 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 26c23d5187..2d62a2e8d7 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,239 +5,208 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cv") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1760192501 - ) - static int field1285; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lmp;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lkf;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2092986285 + intValue = 738275543 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lop;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpv;" + descriptor = "Lpw;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loy;" + descriptor = "Loj;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2128041511 + intValue = -1382536787 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("e") - boolean field1289; - @ObfuscatedName("i") + @ObfuscatedName("j") + boolean field1280; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -880191509 + intValue = -284843695 ) - int field1290; - @ObfuscatedName("y") + int field1275; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1893951709 + intValue = 2120666223 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - ServerPacket field1281; - @ObfuscatedName("g") + ServerPacket field1277; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - ServerPacket field1293; - @ObfuscatedName("v") + ServerPacket field1284; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - ServerPacket field1288; + ServerPacket field1285; PacketWriter() { - this.packetBufferNodes = new IterableNodeDeque(); - this.bufferSize = 0; - this.buffer = new Buffer(5000); - this.packetBuffer = new PacketBuffer(40000); - this.serverPacket = null; - this.serverPacketLength = 0; - this.field1289 = true; - this.field1290 = 0; - this.pendingWrites = 0; + 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.field1280 = true; // L: 22 + this.field1275 = 0; // L: 23 + this.pendingWrites = 0; // L: 24 + } // L: 29 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "480041256" + ) + @Export("clearBuffer") + final void clearBuffer() { + this.packetBufferNodes.rsClear(); // L: 32 + this.bufferSize = 0; // L: 33 + } // L: 34 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-635097246" + ) + @Export("flush") + final void flush() throws IOException { + if (this.socket != null && this.bufferSize > 0) { // L: 37 + this.buffer.offset = 0; // L: 38 + + while (true) { + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); // L: 40 + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { // L: 41 42 + this.socket.write(this.buffer.array, 0, this.buffer.offset); // L: 49 + this.pendingWrites = 0; // L: 50 + 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 + } + } + + } // L: 52 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lib;B)V", + garbageValue = "-1" + ) + @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 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lmp;I)V", + garbageValue = "-597928557" + ) + @Export("setSocket") + void setSocket(AbstractSocket var1) { + this.socket = var1; // L: 62 + } // L: 63 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "401992191" + ) + @Export("close") + void close() { + if (this.socket != null) { // L: 66 + this.socket.close(); // L: 67 + this.socket = null; // L: 68 + } + + } // L: 70 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1183328030" + ) + @Export("removeSocket") + void removeSocket() { + this.socket = null; // L: 73 + } // L: 74 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)Lmp;", + garbageValue = "113" + ) + @Export("getSocket") + AbstractSocket getSocket() { + return this.socket; // L: 77 + } + + @ObfuscatedName("w") + public static double method2425(double var0, double var2, double var4) { + return class112.method2517((var0 - var2) / var4) / var4; // L: 13 } @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "586577523" + garbageValue = "-459150971" ) - @Export("clearBuffer") - final void clearBuffer() { - this.packetBufferNodes.rsClear(); - this.bufferSize = 0; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("flush") - final void flush() throws IOException { - if (this.socket != null && this.bufferSize > 0) { - this.buffer.offset = 0; - - while (true) { - PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); - if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { - this.socket.write(this.buffer.array, 0, this.buffer.offset); - this.pendingWrites = 0; - break; - } - - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); - this.bufferSize -= var1.index; - var1.remove(); - var1.packetBuffer.releaseArray(); - var1.release(); - } - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lis;B)V", - garbageValue = "0" - ) - @Export("addNode") - public final void addNode(PacketBufferNode var1) { - this.packetBufferNodes.addFirst(var1); - var1.index = var1.packetBuffer.offset; - var1.packetBuffer.offset = 0; - this.bufferSize += var1.index; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lmk;I)V", - garbageValue = "1927110230" - ) - @Export("setSocket") - void setSocket(AbstractSocket var1) { - this.socket = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1001132724" - ) - @Export("close") - void close() { - if (this.socket != null) { - this.socket.close(); - this.socket = null; - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "533248193" - ) - @Export("removeSocket") - void removeSocket() { - this.socket = null; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)Lmk;", - garbageValue = "119" - ) - @Export("getSocket") - AbstractSocket getSocket() { - return this.socket; - } - - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2081885223" - ) - static final void method2354() { - if (WorldMapSectionType.ClanChat_inClanChat) { - if (class264.friendsChat != null) { - class264.friendsChat.sort(); - } - - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInFriendsChat(); - } - - WorldMapSectionType.ClanChat_inClanChat = false; - } - - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "926421993" - ) - static final void method2375(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2729()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketWriter var3 = Client.packetWriter; - PacketBufferNode var4 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2715, var3.isaacCipher); - var4.packetBuffer.writeByte(3 + class113.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - var3.addNode(var4); - } - } - } - } + public static void method2401() { + Widget.Widget_cachedSprites.clear(); // L: 707 + Widget.Widget_cachedModels.clear(); // L: 708 + Widget.Widget_cachedFonts.clear(); // L: 709 + Widget.Widget_cachedSpriteMasks.clear(); // L: 710 + } // L: 711 } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index f57582e389..f6a347113b 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -3,145 +3,133 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ff") +@ObfuscatedName("fn") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("q") + @Export("ParamDefinition_archive") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("fj") + @ObfuscatedGetter( + intValue = -1783961739 + ) + @Export("js5Port") + static int js5Port; + @ObfuscatedName("s") @Export("type") char type; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -344905889 + intValue = 1115055465 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("autoDisable") boolean autoDisable; static { - ParamDefinition_cached = new EvictingDualNodeHashTable(64); + ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } ParamComposition() { - this.autoDisable = true; - } + this.autoDisable = true; // L: 16 + } // L: 18 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1043156770" + garbageValue = "1854447416" ) @Export("postDecode") void postDecode() { - } + } // L: 35 - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "1816742030" + descriptor = "(Lop;B)V", + garbageValue = "2" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 41 } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "1310353401" + descriptor = "(Lop;IB)V", + garbageValue = "-109" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.type = KitDefinition.method2959(var1.readByte()); - } else if (var2 == 2) { + if (var2 == 1) { // L: 46 + this.type = class274.method5199(var1.readByte()); // L: 47 + } else if (var2 == 2) { // L: 49 this.defaultInt = var1.readInt(); } else if (var2 == 4) { - this.autoDisable = false; - } else if (var2 == 5) { + this.autoDisable = false; // L: 50 + } else if (var2 == 5) { // L: 51 this.defaultStr = var1.readStringCp1252NullTerminated(); } - } + } // L: 53 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-14378" + descriptor = "(I)Z", + garbageValue = "1612444577" ) @Export("isString") public boolean isString() { - return this.type == 's'; + return this.type == 's'; // L: 56 } - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "13" + descriptor = "(B)V", + garbageValue = "8" ) - public static boolean method3128(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { - return true; + static void method3216() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 313 + Login.currentLoginField = 1; // L: 314 } else { - if (var0 != 0) { - char[] var1 = class316.cp1252AsciiExtension; - - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - } - - return false; + Login.currentLoginField = 0; // L: 317 } - } - @ObfuscatedName("ag") + } // L: 319 + + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "81" + descriptor = "(I)I", + garbageValue = "-329455950" ) - static int method3129(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else if (var0 != 5631 && var0 != 5633) { - if (var0 == 5632) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 26; - return 1; - } else { - return 2; - } - } else { - class54.Interpreter_stringStackSize -= 2; - return 1; - } + static final int method3229() { + return ViewportMouse.ViewportMouse_y; // L: 103 } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 75c5cffc1a..4c9bf8d858 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,637 +1,567 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aq") +@ObfuscatedName("ak") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = 2053999609 - ) - static int field284; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1333600085 - ) - public static int field279; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("PcmPlayer_stereo") public static boolean PcmPlayer_stereo; - @ObfuscatedName("a") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 234394993 + intValue = 1710206631 ) - public static int field283; - @ObfuscatedName("v") + public static int field272; + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("t") @Export("samples") protected int[] samples; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lav;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1215690509 + intValue = -1114914311 ) - int field269; - @ObfuscatedName("b") + int field254; + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 2700493498205354685L + longValue = -139627477628549521L ) @Export("timeMs") long timeMs; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1537731573 + intValue = -964657999 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1674723661 + intValue = -169687701 ) - int field272; - @ObfuscatedName("z") + int field264; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1001923267 + intValue = 275810673 ) - int field265; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = -2229248515898476515L - ) - long field274; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 352319831 - ) - int field275; + int field258; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 998812825 + longValue = 7412881241186270643L ) - int field262; - @ObfuscatedName("n") + long field259; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -388583705 + intValue = 1880549509 ) - int field277; - @ObfuscatedName("u") + int field251; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -1357881854631939735L + intValue = 672902205 ) - long field278; - @ObfuscatedName("d") - boolean field266; - @ObfuscatedName("ay") + int field253; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 461057869 + intValue = -390982901 ) - int field281; - @ObfuscatedName("al") + int field261; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = -127582275051913285L + ) + long field263; + @ObfuscatedName("v") + boolean field257; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -1176592889 + ) + int field267; + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "[Lav;" ) - PcmStream[] field286; - @ObfuscatedName("ao") + PcmStream[] field268; + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "[Lav;" ) - PcmStream[] field282; + PcmStream[] field269; protected PcmPlayer() { - this.field269 = 32; - this.timeMs = UserComparator4.method2406(); - this.field274 = 0L; - this.field275 = 0; - this.field262 = 0; - this.field277 = 0; - this.field278 = 0L; - this.field266 = true; - this.field281 = 0; - this.field286 = new PcmStream[8]; - this.field282 = new PcmStream[8]; - } + this.field254 = 32; // L: 22 + this.timeMs = class111.method2516(); // L: 23 + this.field259 = 0L; // L: 27 + this.field251 = 0; // L: 28 + this.field253 = 0; // L: 29 + this.field261 = 0; // L: 30 + this.field263 = 0L; // L: 31 + this.field257 = true; // L: 32 + this.field267 = 0; // L: 38 + this.field268 = new PcmStream[8]; // L: 39 + this.field269 = new PcmStream[8]; // L: 40 + } // L: 42 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1783507069" + descriptor = "(B)V", + garbageValue = "54" ) @Export("init") protected void init() throws Exception { - } + } // L: 273 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "15" + descriptor = "(II)V", + garbageValue = "122369223" ) @Export("open") protected void open(int var1) throws Exception { - } + } // L: 274 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-625452134" + garbageValue = "1689594693" ) @Export("position") protected int position() throws Exception { - return this.capacity; + return this.capacity; // L: 277 } - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("write") protected void write() throws Exception { - } + } // L: 280 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1440644043" + ) + @Export("close") + protected void close() { + } // L: 281 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-98" + ) + @Export("discard") + protected void discard() throws Exception { + } // L: 282 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lav;I)V", + garbageValue = "242678028" + ) + @Export("setStream") + public final synchronized void setStream(PcmStream var1) { + this.stream = var1; // L: 72 + } // L: 73 @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1407514911" - ) - @Export("close") - protected void close() { - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-115" - ) - @Export("discard") - protected void discard() throws Exception { - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lav;I)V", - garbageValue = "1536652372" - ) - @Export("setStream") - public final synchronized void setStream(PcmStream var1) { - this.stream = var1; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1578748771" + garbageValue = "971942949" ) @Export("run") public final synchronized void run() { - if (this.samples != null) { - long var1 = UserComparator4.method2406(); + if (this.samples != null) { // L: 76 + long var1 = class111.method2516(); // L: 77 try { - if (0L != this.field274) { - if (var1 < this.field274) { + if (this.field259 != 0L) { // L: 79 + if (var1 < this.field259) { // L: 80 return; } - this.open(this.capacity); - this.field274 = 0L; - this.field266 = true; + this.open(this.capacity); // L: 81 + this.field259 = 0L; // L: 82 + this.field257 = true; // L: 83 } - int var3 = this.position(); - if (this.field277 - var3 > this.field275) { - this.field275 = this.field277 - var3; + int var3 = this.position(); // L: 85 + if (this.field261 - var3 > this.field251) { // L: 86 + this.field251 = this.field261 - var3; } - int var4 = this.field272 + this.field265; - if (var4 + 256 > 16384) { + int var4 = this.field258 + this.field264; // L: 87 + if (var4 + 256 > 16384) { // L: 88 var4 = 16128; } - if (var4 + 256 > this.capacity) { - this.capacity += 1024; - if (this.capacity > 16384) { + if (var4 + 256 > this.capacity) { // L: 89 + this.capacity += 1024; // L: 90 + if (this.capacity > 16384) { // L: 91 this.capacity = 16384; } - this.close(); - this.open(this.capacity); - var3 = 0; - this.field266 = true; - if (var4 + 256 > this.capacity) { - var4 = this.capacity - 256; - this.field265 = var4 - this.field272; + this.close(); // L: 92 + this.open(this.capacity); // L: 93 + var3 = 0; // L: 94 + this.field257 = true; // L: 95 + if (var4 + 256 > this.capacity) { // L: 96 + var4 = this.capacity - 256; // L: 97 + this.field258 = var4 - this.field264; // L: 98 } } - while (var3 < var4) { - this.fill(this.samples, 256); - this.write(); - var3 += 256; + while (var3 < var4) { // L: 101 + this.fill(this.samples, 256); // L: 102 + this.write(); // L: 103 + var3 += 256; // L: 104 } - if (var1 > this.field278) { - if (!this.field266) { - if (this.field275 == 0 && this.field262 == 0) { - this.close(); - this.field274 = var1 + 2000L; - return; + if (var1 > this.field263) { // L: 106 + if (!this.field257) { // L: 107 + if (this.field251 == 0 && this.field253 == 0) { // L: 108 + this.close(); // L: 109 + this.field259 = var1 + 2000L; // L: 110 + return; // L: 111 } - this.field265 = Math.min(this.field262, this.field275); - this.field262 = this.field275; + this.field258 = Math.min(this.field253, this.field251); // L: 113 + this.field253 = this.field251; // L: 114 } else { - this.field266 = false; + this.field257 = false; // L: 116 } - this.field275 = 0; - this.field278 = var1 + 2000L; + this.field251 = 0; // L: 117 + this.field263 = var1 + 2000L; // L: 118 } - this.field277 = var3; - } catch (Exception var7) { - this.close(); - this.field274 = var1 + 2000L; + this.field261 = var3; // L: 120 + } catch (Exception var7) { // L: 122 + this.close(); // L: 123 + this.field259 = var1 + 2000L; // L: 124 } try { - if (var1 > this.timeMs + 500000L) { + if (var1 > this.timeMs + 500000L) { // L: 127 var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { - this.skip(256); - this.timeMs += (long)(256000 / field279); + while (var1 > this.timeMs + 5000L) { // L: 128 + this.skip(256); // L: 129 + this.timeMs += (long)(256000 / UserComparator2.field4359); // L: 130 } - } catch (Exception var6) { - this.timeMs = var1; + } catch (Exception var6) { // L: 133 + this.timeMs = var1; // L: 134 } } - } + } // L: 136 - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1285587409" + garbageValue = "2104373839" ) - public final void method696() { - this.field266 = true; - } + public final void method750() { + this.field257 = true; // L: 139 + } // L: 140 - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1511155327" + descriptor = "(S)V", + garbageValue = "31692" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field266 = true; + this.field257 = true; // L: 143 try { - this.discard(); - } catch (Exception var2) { - this.close(); - this.field274 = UserComparator4.method2406() + 2000L; + this.discard(); // L: 145 + } catch (Exception var2) { // L: 147 + this.close(); // L: 148 + this.field259 = class111.method2516() + 2000L; // L: 149 } - } + } // L: 151 - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "25571035" + garbageValue = "1720419183" ) @Export("shutdown") public final synchronized void shutdown() { - if (Skeleton.soundSystem != null) { - boolean var1 = true; + if (class122.soundSystem != null) { // L: 154 + boolean var1 = true; // L: 155 - for (int var2 = 0; var2 < 2; ++var2) { - if (this == Skeleton.soundSystem.players[var2]) { - Skeleton.soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { // L: 156 + if (this == class122.soundSystem.players[var2]) { // L: 157 + class122.soundSystem.players[var2] = null; } - if (Skeleton.soundSystem.players[var2] != null) { + if (class122.soundSystem.players[var2] != null) { // L: 158 var1 = false; } } - if (var1) { - soundSystemExecutor.shutdownNow(); - soundSystemExecutor = null; - Skeleton.soundSystem = null; + if (var1) { // L: 160 + class381.soundSystemExecutor.shutdownNow(); // L: 161 + class381.soundSystemExecutor = null; // L: 162 + class122.soundSystem = null; // L: 163 } } - this.close(); - this.samples = null; - } + this.close(); // L: 166 + this.samples = null; // L: 167 + } // L: 168 - @ObfuscatedName("ab") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "4570450" + garbageValue = "-1660525629" ) @Export("skip") final void skip(int var1) { - this.field281 -= var1; - if (this.field281 < 0) { - this.field281 = 0; + this.field267 -= var1; // L: 171 + if (this.field267 < 0) { + this.field267 = 0; // L: 172 } if (this.stream != null) { - this.stream.skip(var1); + this.stream.skip(var1); // L: 173 } - } + } // L: 174 - @ObfuscatedName("ad") + @ObfuscatedName("ag") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; - if (PcmPlayer_stereo) { + int var3 = var2; // L: 178 + if (PcmPlayer_stereo) { // L: 179 var3 = var2 << 1; } - class321.clearIntArray(var1, 0, var3); - this.field281 -= var2; - if (this.stream != null && this.field281 <= 0) { - this.field281 += field279 >> 4; - class12.PcmStream_disable(this.stream); - this.method711(this.stream, this.stream.vmethod944()); - int var4 = 0; - int var5 = 255; + class321.clearIntArray(var1, 0, var3); // L: 180 + this.field267 -= var2; // L: 181 + if (this.stream != null && this.field267 <= 0) { // L: 182 + this.field267 += UserComparator2.field4359 >> 4; // L: 183 + KitDefinition.PcmStream_disable(this.stream); // L: 184 + this.method719(this.stream, this.stream.vmethod974()); // L: 185 + int var4 = 0; // L: 186 + int var5 = 255; // L: 187 int var6; PcmStream var10; label108: - for (var6 = 7; var5 != 0; --var6) { + for (var6 = 7; var5 != 0; --var6) { // L: 188 int var7; int var8; - if (var6 < 0) { - var7 = var6 & 3; - var8 = -(var6 >> 2); + if (var6 < 0) { // L: 191 + var7 = var6 & 3; // L: 192 + var8 = -(var6 >> 2); // L: 193 } else { - var7 = var6; - var8 = 0; + var7 = var6; // L: 196 + var8 = 0; // L: 197 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { - if ((var9 & 1) != 0) { - var5 &= ~(1 << var7); - var10 = null; - PcmStream var11 = this.field286[var7]; + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 199 201 + if ((var9 & 1) != 0) { // L: 204 + var5 &= ~(1 << var7); // L: 207 + var10 = null; // L: 208 + PcmStream var11 = this.field268[var7]; // L: 209 label102: while (true) { while (true) { - if (var11 == null) { + if (var11 == null) { // L: 210 break label102; } - AbstractSound var12 = var11.sound; - if (var12 != null && var12.position > var8) { - var5 |= 1 << var7; - var10 = var11; - var11 = var11.after; + AbstractSound var12 = var11.sound; // L: 211 + if (var12 != null && var12.position > var8) { // L: 212 + var5 |= 1 << var7; // L: 213 + var10 = var11; // L: 214 + var11 = var11.after; // L: 215 } else { - var11.active = true; - int var13 = var11.vmethod4889(); - var4 += var13; + var11.active = true; // L: 218 + int var13 = var11.vmethod4958(); // L: 219 + var4 += var13; // L: 220 if (var12 != null) { - var12.position += var13; + var12.position += var13; // L: 221 } - if (var4 >= this.field269) { + if (var4 >= this.field254) { // L: 222 break label108; } - PcmStream var14 = var11.firstSubStream(); - if (var14 != null) { - for (int var15 = var11.field335; var14 != null; var14 = var11.nextSubStream()) { - this.method711(var14, var15 * var14.vmethod944() >> 8); + PcmStream var14 = var11.firstSubStream(); // L: 223 + if (var14 != null) { // L: 224 + for (int var15 = var11.field320; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228 + this.method719(var14, var15 * var14.vmethod974() >> 8); // L: 227 } } - PcmStream var18 = var11.after; - var11.after = null; - if (var10 == null) { - this.field286[var7] = var18; + PcmStream var18 = var11.after; // L: 231 + var11.after = null; // L: 232 + if (var10 == null) { // L: 233 + this.field268[var7] = var18; } else { - var10.after = var18; + var10.after = var18; // L: 234 } - if (var18 == null) { - this.field282[var7] = var10; + if (var18 == null) { // L: 235 + this.field269[var7] = var10; } - var11 = var18; + var11 = var18; // L: 236 } } } } - var7 += 4; + var7 += 4; // L: 200 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field286[var6]; - PcmStream[] var17 = this.field286; - this.field282[var6] = null; + for (var6 = 0; var6 < 8; ++var6) { // L: 240 + PcmStream var16 = this.field268[var6]; // L: 241 + PcmStream[] var17 = this.field268; // L: 242 + this.field269[var6] = null; // L: 244 - for (var17[var6] = null; var16 != null; var16 = var10) { - var10 = var16.after; - var16.after = null; + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 245 246 249 + var10 = var16.after; // L: 247 + var16.after = null; // L: 248 } } } - if (this.field281 < 0) { - this.field281 = 0; + if (this.field267 < 0) { // L: 253 + this.field267 = 0; } if (this.stream != null) { - this.stream.fill(var1, 0, var2); + this.stream.fill(var1, 0, var2); // L: 254 } - this.timeMs = UserComparator4.method2406(); - } + this.timeMs = class111.method2516(); // L: 255 + } // L: 256 - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lav;II)V", - garbageValue = "589893178" + descriptor = "(Lav;IS)V", + garbageValue = "2601" ) - final void method711(PcmStream var1, int var2) { - int var3 = var2 >> 5; - PcmStream var4 = this.field282[var3]; - if (var4 == null) { - this.field286[var3] = var1; + final void method719(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 265 + PcmStream var4 = this.field269[var3]; // L: 266 + if (var4 == null) { // L: 267 + this.field268[var3] = var1; } else { - var4.after = var1; + var4.after = var1; // L: 268 } - this.field282[var3] = var1; - var1.field335 = var2; - } + this.field269[var3] = var1; // L: 269 + var1.field320 = var2; // L: 270 + } // L: 271 - @ObfuscatedName("m") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)[Lfp;", - garbageValue = "1715478775" + descriptor = "(Lai;I)V", + garbageValue = "-1238015178" ) - static HorizontalAlignment[] method702() { - return new HorizontalAlignment[]{HorizontalAlignment.field1708, HorizontalAlignment.field1707, HorizontalAlignment.HorizontalAlignment_centered}; - } + static void method757(GameEngine var0) { + while (WorldMapElement.isKeyDown()) { // L: 1513 + if (class12.field55 == 13) { // L: 1514 + class10.method104(); // L: 1515 + return; // L: 1516 + } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)[Ljm;", - garbageValue = "1452483568" - ) - public static class283[] method744() { - return new class283[]{class283.field3648, class283.field3646, class283.field3649, class283.field3647}; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1564904197" - ) - static int method697(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - } else { - var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - String var4 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]) { + if (class12.field55 == 96) { // L: 1518 + if (Login.worldSelectPage > 0 && UserComparator6.worldSelectLeftSprite != null) { // L: 1519 + --Login.worldSelectPage; // L: 1520 } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var8 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); + } else if (class12.field55 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && MouseRecorder.worldSelectRightSprite != null) { // L: 1523 1524 + ++Login.worldSelectPage; // L: 1525 } } - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); - } else { - var8 = null; - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { - var3.onVarTransmit = var8; - var3.varTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { - var3.onInvTransmit = var8; - var3.invTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { - var3.onStatTransmit = var8; - var3.statTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.onStockTransmit = var8; - } else if (var0 == 1426) { - var3.field3168 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { - var3.field3161 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { - var3.field3163 = var8; - } else if (var0 == 1430) { - var3.field3157 = var8; - } else { - if (var0 != 1431) { - return 2; + if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1529 + int var1 = Login.xPadding + 280; // L: 1530 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1531 + PlayerType.changeWorldSelectSorting(0, 0); // L: 1532 + return; // L: 1533 } - var3.field3158 = var8; + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1535 + PlayerType.changeWorldSelectSorting(0, 1); // L: 1536 + return; // L: 1537 + } + + int var2 = Login.xPadding + 390; // L: 1539 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1540 + PlayerType.changeWorldSelectSorting(1, 0); // L: 1541 + return; // L: 1542 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1544 + PlayerType.changeWorldSelectSorting(1, 1); // L: 1545 + return; // L: 1546 + } + + int var3 = Login.xPadding + 500; // L: 1548 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1549 + PlayerType.changeWorldSelectSorting(2, 0); // L: 1550 + return; // L: 1551 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1553 + PlayerType.changeWorldSelectSorting(2, 1); // L: 1554 + return; // L: 1555 + } + + int var4 = Login.xPadding + 610; // L: 1557 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1558 + PlayerType.changeWorldSelectSorting(3, 0); // L: 1559 + return; // L: 1560 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1562 + PlayerType.changeWorldSelectSorting(3, 1); // L: 1563 + return; // L: 1564 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1566 + class10.method104(); // L: 1567 + return; // L: 1568 + } + + if (Login.hoveredWorldIndex != -1) { // L: 1570 + World var5 = WorldMapEvent.World_worlds[Login.hoveredWorldIndex]; // L: 1571 + MidiPcmStream.changeWorld(var5); // L: 1572 + class10.method104(); // L: 1573 + return; // L: 1574 + } + + if (Login.worldSelectPage > 0 && UserComparator6.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= UserComparator6.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= KeyHandler.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= KeyHandler.canvasHeight / 2 + 50) { // L: 1576 + --Login.worldSelectPage; // L: 1577 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && MouseRecorder.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GameEngine.canvasWidth - MouseRecorder.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GameEngine.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= KeyHandler.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= KeyHandler.canvasHeight / 2 + 50) { // L: 1579 + ++Login.worldSelectPage; // L: 1580 + } } - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-856147347" - ) - static void method741(int var0, int var1) { - if (WorldMapDecorationType.clientPreferences.musicVolume != 0 && var0 != -1) { - class67.method1886(class4.archive11, var0, 0, WorldMapDecorationType.clientPreferences.musicVolume, false); - Client.field663 = true; - } - - } + } // L: 1583 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index d972bb95d2..ab580a530d 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -9,63 +9,63 @@ public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lav;" ) @Export("after") PcmStream after; - @ObfuscatedName("x") - int field335; - @ObfuscatedName("p") + @ObfuscatedName("z") + int field320; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbl;" ) @Export("sound") AbstractSound sound; protected PcmStream() { - this.active = true; - } + this.active = true; // L: 11 + } // L: 13 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("a") - protected abstract int vmethod4889(); + @ObfuscatedName("p") + protected abstract int vmethod4958(); - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("aq") - int vmethod944() { - return 255; + @ObfuscatedName("au") + int vmethod974() { + return 255; // L: 16 } - @ObfuscatedName("ei") + @ObfuscatedName("fp") @Export("update") final void update(int[] var1, int var2, int var3) { - if (this.active) { + if (this.active) { // L: 24 this.fill(var1, var2, var3); } else { - this.skip(var3); + this.skip(var3); // L: 25 } - } + } // L: 26 } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index d5a505ff6b..b4cd994920 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,201 +3,201 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("as") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) - NodeDeque field238; - @ObfuscatedName("f") - int field239; - @ObfuscatedName("j") - int field240; + NodeDeque field227; + @ObfuscatedName("a") + int field226; + @ObfuscatedName("o") + int field229; public PcmStreamMixer() { - this.subStreams = new NodeDeque(); - this.field238 = new NodeDeque(); - this.field239 = 0; - this.field240 = -1; + this.subStreams = new NodeDeque(); // L: 9 + this.field227 = new NodeDeque(); // L: 10 + this.field226 = 0; // L: 11 + this.field229 = -1; // L: 12 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Lav;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); - } + this.subStreams.addLast(var1); // L: 15 + } // L: 16 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Lav;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); - } + var1.remove(); // L: 19 + } // L: 20 - @ObfuscatedName("f") - void method619() { - if (this.field239 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field238.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field238.previous()) { - var1.field382 -= this.field239; + @ObfuscatedName("s") + void method663() { + if (this.field226 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field227.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field227.previous()) { // L: 24 + var1.field368 -= this.field226; // L: 25 } - this.field240 -= this.field239; - this.field239 = 0; + this.field229 -= this.field226; // L: 27 + this.field226 = 0; // L: 28 } - } + } // L: 30 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lnv;Laz;)V" + descriptor = "(Lns;Law;)V" ) - void method645(Node var1, PcmStreamMixerListener var2) { - while (this.field238.sentinel != var1 && ((PcmStreamMixerListener)var1).field382 <= var2.field382) { + void method651(Node var1, PcmStreamMixerListener var2) { + while (this.field227.sentinel != var1 && ((PcmStreamMixerListener)var1).field368 <= var2.field368) { // L: 33 var1 = var1.previous; } - NodeDeque.NodeDeque_addBefore(var2, var1); - this.field240 = ((PcmStreamMixerListener)this.field238.sentinel.previous).field382; - } + NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 + this.field229 = ((PcmStreamMixerListener)this.field227.sentinel.previous).field368; // L: 35 + } // L: 36 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Laz;)V" + descriptor = "(Law;)V" ) - void method621(PcmStreamMixerListener var1) { - var1.remove(); - var1.remove2(); - Node var2 = this.field238.sentinel.previous; - if (var2 == this.field238.sentinel) { - this.field240 = -1; + void method633(PcmStreamMixerListener var1) { + var1.remove(); // L: 39 + var1.remove2(); // L: 40 + Node var2 = this.field227.sentinel.previous; // L: 41 + if (var2 == this.field227.sentinel) { + this.field229 = -1; // L: 42 } else { - this.field240 = ((PcmStreamMixerListener)var2).field382; + this.field229 = ((PcmStreamMixerListener)var2).field368; // L: 43 } - } + } // L: 44 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return (PcmStream)this.subStreams.last(); + return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return (PcmStream)this.subStreams.previous(); + return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("a") - protected int vmethod4889() { - return 0; + @ObfuscatedName("p") + protected int vmethod4958() { + return 0; // L: 55 } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field240 < 0) { - this.updateSubStreams(var1, var2, var3); - return; + if (this.field229 < 0) { // L: 60 + this.updateSubStreams(var1, var2, var3); // L: 61 + return; // L: 62 } - if (var3 + this.field239 < this.field240) { - this.field239 += var3; - this.updateSubStreams(var1, var2, var3); - return; + if (var3 + this.field226 < this.field229) { // L: 64 + this.field226 += var3; // L: 65 + this.updateSubStreams(var1, var2, var3); // L: 66 + return; // L: 67 } - int var4 = this.field240 - this.field239; - this.updateSubStreams(var1, var2, var4); - var2 += var4; - var3 -= var4; - this.field239 += var4; - this.method619(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field238.last(); - synchronized(var5) { - int var7 = var5.update(); - if (var7 < 0) { - var5.field382 = 0; - this.method621(var5); + int var4 = this.field229 - this.field226; // L: 69 + this.updateSubStreams(var1, var2, var4); // L: 70 + var2 += var4; // L: 71 + var3 -= var4; // L: 72 + this.field226 += var4; // L: 73 + this.method663(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field227.last(); // L: 75 + synchronized(var5) { // L: 76 + int var7 = var5.update(); // L: 77 + if (var7 < 0) { // L: 78 + var5.field368 = 0; // L: 79 + this.method633(var5); // L: 80 } else { - var5.field382 = var7; - this.method645(var5.previous, var5); + var5.field368 = var7; // L: 83 + this.method651(var5.previous, var5); // L: 84 } } - } while(var3 != 0); + } while(var3 != 0); // L: 87 } - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { - for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { - var4.update(var1, var2, var3); + for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 + var4.update(var1, var2, var3); // L: 93 } + } // L: 95 + + @ObfuscatedName("x") + @Export("skip") + public final synchronized void skip(int var1) { + do { + if (this.field229 < 0) { // L: 99 + this.skipSubStreams(var1); // L: 100 + return; // L: 101 + } + + if (this.field226 + var1 < this.field229) { // L: 103 + this.field226 += var1; // L: 104 + this.skipSubStreams(var1); // L: 105 + return; // L: 106 + } + + int var2 = this.field229 - this.field226; // L: 108 + this.skipSubStreams(var2); // L: 109 + var1 -= var2; // L: 110 + this.field226 += var2; // L: 111 + this.method663(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field227.last(); // L: 113 + synchronized(var3) { // L: 114 + int var5 = var3.update(); // L: 115 + if (var5 < 0) { // L: 116 + var3.field368 = 0; // L: 117 + this.method633(var3); // L: 118 + } else { + var3.field368 = var5; // L: 121 + this.method651(var3.previous, var3); // L: 122 + } + } + } while(var1 != 0); // L: 125 + } @ObfuscatedName("y") - @Export("skip") - public final synchronized void skip(int var1) { - do { - if (this.field240 < 0) { - this.skipSubStreams(var1); - return; - } - - if (this.field239 + var1 < this.field240) { - this.field239 += var1; - this.skipSubStreams(var1); - return; - } - - int var2 = this.field240 - this.field239; - this.skipSubStreams(var2); - var1 -= var2; - this.field239 += var2; - this.method619(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field238.last(); - synchronized(var3) { - int var5 = var3.update(); - if (var5 < 0) { - var3.field382 = 0; - this.method621(var3); - } else { - var3.field382 = var5; - this.method645(var3.previous, var3); - } - } - } while(var1 != 0); - - } - - @ObfuscatedName("w") @Export("skipSubStreams") void skipSubStreams(int var1) { - for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.skip(var1); + for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 + var2.skip(var1); // L: 131 } - } + } // L: 133 } diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index be0326d986..7c2f530ed5 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("aw") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("l") - int field382; + @ObfuscatedName("i") + int field368; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("remove2") abstract void remove2(); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lao;)I" + descriptor = "(Las;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index a84f1fa8c0..b4af4074c9 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -4,435 +4,142 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("cn") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "Lmk;" - ) - static AbstractSocket field1101; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -64819785 + intValue = -1526505763 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1686538883 + intValue = 1918488327 ) @Export("type") int type; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1948405039 + intValue = -1150411383 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1302314377 + intValue = 471891205 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -36721559 + intValue = -2142358413 ) @Export("objectId") int objectId; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1553617043 + intValue = 1726933753 ) - int field1095; - @ObfuscatedName("t") + int field1075; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 531221351 + intValue = -2134886005 ) - int field1096; - @ObfuscatedName("a") + int field1076; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 474756437 + intValue = -821600297 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1648049167 + intValue = 1752810997 ) @Export("orientation") int orientation; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -716448433 + intValue = 1311182743 ) - int field1104; - @ObfuscatedName("y") + int field1082; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 161742555 + intValue = -472158759 ) @Export("delay") int delay; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1575290553 + intValue = -1663724523 ) @Export("hitpoints") int hitpoints; PendingSpawn() { - this.delay = 0; - this.hitpoints = -1; + this.delay = 0; // L: 16 + this.hitpoints = -1; // L: 17 + } // L: 19 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "([BIILhf;[Lfq;I)V", + garbageValue = "-79780514" + ) + static final void method2162(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 258 + int var6 = -1; // L: 259 + + while (true) { + int var7 = var5.method6981(); // L: 261 + if (var7 == 0) { // L: 262 + return; // L: 286 + } + + var6 += var7; // L: 263 + int var8 = 0; // L: 264 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 266 + if (var9 == 0) { // L: 267 + break; + } + + var8 += var9 - 1; // L: 268 + int var10 = var8 & 63; // L: 269 + int var11 = var8 >> 6 & 63; // L: 270 + int var12 = var8 >> 12; // L: 271 + int var13 = var5.readUnsignedByte(); // L: 272 + int var14 = var13 >> 2; // L: 273 + int var15 = var13 & 3; // L: 274 + int var16 = var11 + var1; // L: 275 + int var17 = var10 + var2; // L: 276 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 277 + int var18 = var12; // L: 278 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 279 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 280 + if (var18 >= 0) { // L: 281 + var19 = var4[var18]; + } + + class92.method2276(var12, var16, var17, var6, var15, var14, var3, var19); // L: 282 + } + } + } } - @ObfuscatedName("gf") + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "14" + descriptor = "(Ljf;I)I", + garbageValue = "-1849354153" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (class67.localPlayer.x >> 7 == Client.destinationX && class67.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - class326.method5929(); - class18.method280(); - UserComparator5.addNpcsToScene(true); - class355.method6311(); - UserComparator5.addNpcsToScene(false); - FriendsChat.method5993(); - class54.method1055(); - class130.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var18; - if (!Client.isCameraLocked) { - var4 = Client.camAngleX; - if (Client.field565 / 256 > var4) { - var4 = Client.field565 / 256; - } - - if (Client.field739[4] && Client.field741[4] + 128 > var4) { - var4 = Client.field741[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = class132.oculusOrbFocalPointX; - var7 = class194.field2186; - var8 = LoginScreenAnimation.oculusOrbFocalPointY; - var9 = NetCache.method5335(var4); - var11 = var3 - 334; - if (var11 < 0) { - var11 = 0; - } else if (var11 > 100) { - var11 = 100; - } - - var12 = (Client.zoomWidth - Client.zoomHeight) * var11 / 100 + Client.zoomHeight; - var10 = var12 * var9 / 256; - var11 = 2048 - var4 & 2047; - var12 = 2048 - var5 & 2047; - int var13 = 0; - var14 = 0; - var15 = var10; - int var17; - if (var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var17 * var14 - var10 * var16 >> 16; - var15 = var10 * var17 + var14 * var16 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var15 * var16 + var13 * var17 >> 16; - var15 = var15 * var17 - var13 * var16 >> 16; - var13 = var18; - } - - Canvas.cameraX = var6 - var13; - class14.cameraY = var7 - var14; - VarpDefinition.cameraZ = var8 - var15; - WorldMapIcon_1.cameraPitch = var4; - HealthBarUpdate.cameraYaw = var5; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class132.oculusOrbFocalPointX >> 7 != class67.localPlayer.x >> 7 || LoginScreenAnimation.oculusOrbFocalPointY >> 7 != class67.localPlayer.y >> 7)) { - var16 = class67.localPlayer.plane; - var17 = (class132.oculusOrbFocalPointX >> 7) + WorldMapSectionType.baseX; - var18 = (LoginScreenAnimation.oculusOrbFocalPointY >> 7) + PlayerComposition.baseY; - UrlRequest.method2386(var17, var18, var16, true); - } - } - - if (!Client.isCameraLocked) { - var4 = class117.method2519(); - } else { - if (WorldMapDecorationType.clientPreferences.roofsHidden) { - var5 = VertexNormal.Client_plane; - } else { - var6 = MidiPcmStream.getTileHeight(Canvas.cameraX, VarpDefinition.cameraZ, VertexNormal.Client_plane); - if (var6 - class14.cameraY < 800 && (Tiles.Tiles_renderFlags[VertexNormal.Client_plane][Canvas.cameraX >> 7][VarpDefinition.cameraZ >> 7] & 4) != 0) { - var5 = VertexNormal.Client_plane; - } else { - var5 = 3; - } - } - - var4 = var5; - } - - var5 = Canvas.cameraX; - var6 = class14.cameraY; - var7 = VarpDefinition.cameraZ; - var8 = WorldMapIcon_1.cameraPitch; - var9 = HealthBarUpdate.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field739[var10]) { - var11 = (int)(Math.random() * (double)(Client.field740[var10] * 2 + 1) - (double)Client.field740[var10] + Math.sin((double)Client.field743[var10] * ((double)Client.field742[var10] / 100.0D)) * (double)Client.field741[var10]); - if (var10 == 0) { - Canvas.cameraX += var11; - } - - if (var10 == 1) { - class14.cameraY += var11; - } - - if (var10 == 2) { - VarpDefinition.cameraZ += var11; - } - - if (var10 == 3) { - HealthBarUpdate.cameraYaw = var11 + HealthBarUpdate.cameraYaw & 2047; - } - - if (var10 == 4) { - WorldMapIcon_1.cameraPitch += var11; - if (WorldMapIcon_1.cameraPitch < 128) { - WorldMapIcon_1.cameraPitch = 128; - } - - if (WorldMapIcon_1.cameraPitch > 383) { - WorldMapIcon_1.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - class67.method1888(var10 - var0, var11 - var1); - } else { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - - class356.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class356.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - PlayerComposition.scene.draw(Canvas.cameraX, class14.cameraY, VarpDefinition.cameraZ, WorldMapIcon_1.cameraPitch, HealthBarUpdate.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; - class356.playPcmPlayers(); - PlayerComposition.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var31 = false; - var14 = -1; - var15 = -1; - var16 = Players.Players_count; - int[] var28 = Players.Players_indices; - - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { - Object var30; - if (var18 < var16) { - var30 = Client.players[var28[var18]]; - if (var28[var18] == Client.combatTargetPlayerIndex) { - var31 = true; - var14 = var18; - continue; - } - - if (var30 == class67.localPlayer) { - var15 = var18; - continue; - } - } else { - var30 = Client.npcs[Client.npcIndices[var18 - var16]]; - } - - BufferedFile.drawActor2d((Actor)var30, var18, var0, var1, var2, var3); - } - - if (Client.renderSelf && var15 != -1) { - BufferedFile.drawActor2d(class67.localPlayer, var15, var0, var1, var2, var3); - } - - if (var31) { - BufferedFile.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); - } - - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { - int var19 = Client.overheadTextXs[var18]; - int var20 = Client.overheadTextYs[var18]; - int var21 = Client.overheadTextXOffsets[var18]; - int var22 = Client.overheadTextAscents[var18]; - boolean var23 = true; - - while (var23) { - var23 = false; - - for (int var29 = 0; var29 < var18; ++var29) { - if (var20 + 2 > Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] && var20 - var22 < Client.overheadTextYs[var29] + 2 && var19 - var21 < Client.overheadTextXOffsets[var29] + Client.overheadTextXs[var29] && var21 + var19 > Client.overheadTextXs[var29] - Client.overheadTextXOffsets[var29] && Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] < var20) { - var20 = Client.overheadTextYs[var29] - Client.overheadTextAscents[var29]; - var23 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var18]; - Client.viewportTempY = Client.overheadTextYs[var18] = var20; - String var24 = Client.overheadText[var18]; - if (Client.chatEffects == 0) { - int var25 = 16776960; - if (Client.overheadTextColors[var18] < 6) { - var25 = Client.field554[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { - var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var18] == 7) { - var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var18] == 8) { - var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 1280 + 16711680; - } else if (var26 < 100) { - var25 = 16776960 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var18] == 10) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 5 + 16711680; - } else if (var26 < 100) { - var25 = 16711935 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; - } - } - - if (Client.overheadTextColors[var18] == 11) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = 16777215 - var26 * 327685; - } else if (var26 < 100) { - var25 = (var26 - 50) * 327685 + 65280; - } else if (var26 < 150) { - var25 = 16777215 - (var26 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var18] == 0) { - Interpreter.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { - Interpreter.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { - Interpreter.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { - Interpreter.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (Interpreter.fontBold12.stringWidth(var24) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - Interpreter.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var18] == 5) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - int var27 = 0; - if (var26 < 25) { - var27 = var26 - 25; - } else if (var26 > 125) { - var27 = var26 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Interpreter.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - Interpreter.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - Interpreter.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - WorldMapScaleHandler.method4005(var0, var1); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field536); - class11.method110(var0, var1, var2, var3); - Canvas.cameraX = var5; - class14.cameraY = var6; - VarpDefinition.cameraZ = var7; - WorldMapIcon_1.cameraPitch = var8; - HealthBarUpdate.cameraYaw = var9; - if (Client.isLoading) { - byte var32 = 0; - var14 = var32 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if (var14 == 0) { - Client.isLoading = false; - } - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - ScriptFrame.drawLoadingMessage("Loading - please wait.", false); - } - + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11879 + return var1 != null ? var1.integer : var0.flags; // L: 11880 11881 } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 875412b8bf..db3db052e0 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,971 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nr") +@ObfuscatedName("np") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1197166297 + intValue = -855312751 ) - int field4103; - @ObfuscatedName("ao") - boolean field4096; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -1040893309 - ) - int field4097; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 1392249455 - ) - int field4098; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = -1075806637 - ) - int field4109; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -530796901 - ) - int field4100; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1276768227 - ) - int field4101; - @ObfuscatedName("ac") - boolean field4107; + int field4092; + @ObfuscatedName("as") + boolean field4091; @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -2099427815 + intValue = 934385817 ) - int field4099; - @ObfuscatedName("ax") + int field4093; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1412007133 + intValue = -841511077 ) - int field4104; + int field4095; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = -88776347 + ) + int field4096; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 1463853317 + ) + int field4094; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = 117450165 + ) + int field4103; + @ObfuscatedName("ar") + boolean field4086; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 330580727 + ) + int field4100; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = -376982197 + ) + int field4101; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -309561397 + intValue = 922950559 ) - int field4105; + int field4102; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 401410233 + intValue = -1991963229 ) - int field4106; + int field4104; + @ObfuscatedName("au") + String field4098; @ObfuscatedName("aj") - String field4110; - @ObfuscatedName("am") - String field4084; - @ObfuscatedName("aw") - String field4094; - @ObfuscatedName("az") - String field4095; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = 646549057 - ) - int field4090; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = -1327131373 - ) - int field4118; + String field4099; @ObfuscatedName("af") + String field4106; + @ObfuscatedName("aw") + String field4107; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1421225597 + intValue = 1913673055 + ) + int field4108; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 1121209561 + ) + int field4109; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = -64925851 ) int field4112; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = -988523473 - ) - int field4114; - @ObfuscatedName("bt") - String field4115; @ObfuscatedName("bg") - String field4113; - @ObfuscatedName("bf") - int[] field4108; - @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1802718035 + intValue = 933896169 ) - int field4117; - @ObfuscatedName("bo") - String field4119; + int field4111; + @ObfuscatedName("bl") + String field4105; + @ObfuscatedName("bx") + String field4113; + @ObfuscatedName("bd") + int[] field4114; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = -194577267 + ) + int field4115; + @ObfuscatedName("bf") + String field4116; 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.field4108 = new int[3]; - this.field4103 = var1; - this.field4096 = var2; - this.field4097 = var3; - this.field4098 = var4; - this.field4109 = var5; - this.field4100 = var6; - this.field4101 = var7; - this.field4107 = var8; - this.field4099 = var9; - this.field4104 = var10; - this.field4105 = var11; - this.field4106 = var12; - this.field4110 = var13; - this.field4084 = var14; - this.field4094 = var15; - this.field4095 = var16; - this.field4090 = var17; - this.field4118 = var18; - this.field4112 = var19; - this.field4114 = var20; - this.field4115 = var21; - this.field4113 = var22; - this.field4108 = var23; - this.field4117 = var24; - this.field4119 = var25; - } + this.field4114 = new int[3]; // L: 62 + this.field4092 = var1; // L: 67 + this.field4091 = var2; // L: 68 + this.field4093 = var3; // L: 69 + this.field4095 = var4; // L: 70 + this.field4096 = var5; // L: 71 + this.field4094 = var6; // L: 72 + this.field4103 = var7; // L: 73 + this.field4086 = var8; // L: 74 + this.field4100 = var9; // L: 75 + this.field4101 = var10; // L: 76 + this.field4102 = var11; // L: 77 + this.field4104 = var12; // L: 78 + this.field4098 = var13; // L: 79 + this.field4099 = var14; // L: 80 + this.field4106 = var15; // L: 81 + this.field4107 = var16; // L: 82 + this.field4108 = var17; // L: 83 + this.field4109 = var18; // L: 84 + this.field4112 = var19; // L: 85 + this.field4111 = var20; // L: 86 + this.field4105 = var21; // L: 87 + this.field4113 = var22; // L: 88 + this.field4114 = var23; // L: 89 + this.field4115 = var24; // L: 90 + this.field4116 = var25; // L: 91 + } // L: 92 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "92" + descriptor = "(Lop;I)V", + garbageValue = "1363785145" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(8); - var1.writeByte(this.field4103); - var1.writeByte(this.field4096 ? 1 : 0); - var1.writeShort(this.field4097); - var1.writeByte(this.field4098); - var1.writeByte(this.field4109); - var1.writeByte(this.field4100); - var1.writeByte(this.field4101); - var1.writeByte(this.field4107 ? 1 : 0); - var1.writeShort(this.field4099); - var1.writeByte(this.field4104); - var1.writeMedium(this.field4105); - var1.writeShort(this.field4106); - var1.writeStringCp1252NullCircumfixed(this.field4110); - var1.writeStringCp1252NullCircumfixed(this.field4084); - var1.writeStringCp1252NullCircumfixed(this.field4094); - var1.writeStringCp1252NullCircumfixed(this.field4095); - var1.writeByte(this.field4118); - var1.writeShort(this.field4090); - var1.writeStringCp1252NullCircumfixed(this.field4115); - var1.writeStringCp1252NullCircumfixed(this.field4113); - var1.writeByte(this.field4112); - var1.writeByte(this.field4114); + var1.writeByte(8); // L: 95 + var1.writeByte(this.field4092); // L: 96 + var1.writeByte(this.field4091 ? 1 : 0); // L: 97 + var1.writeShort(this.field4093); // L: 98 + var1.writeByte(this.field4095); // L: 99 + var1.writeByte(this.field4096); // L: 100 + var1.writeByte(this.field4094); // L: 101 + var1.writeByte(this.field4103); // L: 102 + var1.writeByte(this.field4086 ? 1 : 0); // L: 103 + var1.writeShort(this.field4100); // L: 104 + var1.writeByte(this.field4101); // L: 105 + var1.writeMedium(this.field4102); // L: 106 + var1.writeShort(this.field4104); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field4098); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field4099); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field4106); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field4107); // L: 111 + var1.writeByte(this.field4109); // L: 112 + var1.writeShort(this.field4108); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field4105); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field4113); // L: 115 + var1.writeByte(this.field4112); // L: 116 + var1.writeByte(this.field4111); // L: 117 - for (int var2 = 0; var2 < this.field4108.length; ++var2) { - var1.writeInt(this.field4108[var2]); + for (int var2 = 0; var2 < this.field4114.length; ++var2) { // L: 118 + var1.writeInt(this.field4114[var2]); } - var1.writeInt(this.field4117); - var1.writeStringCp1252NullCircumfixed(this.field4119); - } + var1.writeInt(this.field4115); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field4116); // L: 120 + } // L: 121 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-695384014" + garbageValue = "1151210729" ) @Export("size") public int size() { - byte var1 = 39; - int var2 = var1 + class28.method414(this.field4110); - var2 += class28.method414(this.field4084); - var2 += class28.method414(this.field4094); - var2 += class28.method414(this.field4095); - var2 += class28.method414(this.field4115); - var2 += class28.method414(this.field4113); - var2 += class28.method414(this.field4119); - return var2; - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "2" - ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2763, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.method7029(PacketBufferNode.selectedItemId); - var8.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.writeShort(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.writeIntME(UserComparator6.selectedItemWidget); - var8.packetBuffer.writeShort(ArchiveDiskAction.selectedItemSlot); - Client.packetWriter.addNode(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2728, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(Client.field647); - var8.packetBuffer.method6942(ModelData0.selectedSpellWidget); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method7029(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2762, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.method7026(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7029(PlayerComposition.baseY + var1); - var8.packetBuffer.method7029(var0 + WorldMapSectionType.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2708, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(PlayerComposition.baseY + var1); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7029(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2700, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(PlayerComposition.baseY + var1); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method7026(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7029(var3); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2717, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6942(UserComparator6.selectedItemWidget); - var9.packetBuffer.method6931(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6930(PacketBufferNode.selectedItemId); - var9.packetBuffer.method6930(ArchiveDiskAction.selectedItemSlot); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2747, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6930(Client.selectedSpellChildIndex); - var9.packetBuffer.method7029(var3); - var9.packetBuffer.method6940(ModelData0.selectedSpellWidget); - var9.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(Client.field647); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2729, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2721, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2711, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6930(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2691, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6931(var3); - var9.packetBuffer.method7026(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2753, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6931(ArchiveDiskAction.selectedItemSlot); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6940(UserComparator6.selectedItemWidget); - var9.packetBuffer.method7029(PacketBufferNode.selectedItemId); - var9.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2764, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6942(ModelData0.selectedSpellWidget); - var9.packetBuffer.method6931(var3); - var9.packetBuffer.method6931(Client.field647); - var9.packetBuffer.method6931(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6931(var3); - var8.packetBuffer.writeShort(PacketBufferNode.selectedItemId); - var8.packetBuffer.writeInt(UserComparator6.selectedItemWidget); - var8.packetBuffer.method7029(PlayerComposition.baseY + var1); - var8.packetBuffer.method6930(ArchiveDiskAction.selectedItemSlot); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.method6930(var3); - var8.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method7029(Client.field647); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method6942(ModelData0.selectedSpellWidget); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2683, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.writeShort(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2692, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method7029(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6931(PlayerComposition.baseY + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2707, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.writeShort(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7029(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.method7026(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6931(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method7029(PlayerComposition.baseY + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2736, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7026(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method7029(PlayerComposition.baseY + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - PlayerComposition.scene.setViewportWalking(); - } else { - PlayerComposition.scene.menuOpen(VertexNormal.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var11; - Widget var16; - if (var2 == 24) { - var16 = HealthBarUpdate.getWidget(var1); - boolean var12 = true; - if (var16.contentType > 0) { - var12 = class244.method4661(var16); - } - - if (var12) { - var11 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var11); - } - } else { - if (var2 == 25) { - var16 = ViewportMouse.getWidgetChild(var1, var0); - if (var16 != null) { - class258.Widget_runOnTargetLeave(); - ArchiveDiskAction.selectSpell(var1, var0, Interpreter.Widget_unpackTargetMask(WorldMapRegion.getWidgetFlags(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = GameEngine.Widget_getSpellActionName(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + FloorUnderlayDefinition.colorStartTag(16777215); - } else { - Client.selectedSpellName = FloorUnderlayDefinition.colorStartTag(65280) + var16.spellName + FloorUnderlayDefinition.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - WorldMapLabelSize.method3445(); - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = HealthBarUpdate.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]; - NetSocket.changeGameOptions(var10); - } - } else if (var2 == 29) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = HealthBarUpdate.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]; - NetSocket.changeGameOptions(var10); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - Decimator.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = ViewportMouse.getWidgetChild(var1, var0); - class16.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2716, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(PacketBufferNode.selectedItemId); - var8.packetBuffer.method6940(var1); - var8.packetBuffer.writeShort(ArchiveDiskAction.selectedItemSlot); - var8.packetBuffer.method7029(var0); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.writeIntME(UserComparator6.selectedItemWidget); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 32) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2719, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method7029(var0); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeIntME(ModelData0.selectedSpellWidget); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 33) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6940(var1); - var8.packetBuffer.method6930(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 34) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2731, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var0); - var8.packetBuffer.method6930(var3); - var8.packetBuffer.writeIntME(var1); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 35) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(var3); - var8.packetBuffer.method6940(var1); - var8.packetBuffer.method6931(var0); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 36) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2685, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(var0); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.method6942(var1); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 37) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(var3); - var8.packetBuffer.method6942(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else { - if (var2 == 38) { - class258.Widget_runOnTargetLeave(); - var16 = HealthBarUpdate.getWidget(var1); - Client.isItemSelected = 1; - ArchiveDiskAction.selectedItemSlot = var0; - UserComparator6.selectedItemWidget = var1; - PacketBufferNode.selectedItemId = var3; - class16.invalidateWidget(var16); - Client.selectedItemName = FloorUnderlayDefinition.colorStartTag(16748608) + class87.ItemDefinition_get(var3).name + FloorUnderlayDefinition.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2726, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6942(var1); - var8.packetBuffer.method6931(var3); - var8.packetBuffer.method6930(var0); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 40) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 41) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2699, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6930(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 42) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2722, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6940(var1); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.method6931(var0); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 43) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2689, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var3); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - } else if (var2 == 44) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6930(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2761, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6931(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6931(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6931(var3); - var9.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6930(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6930(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7029(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7029(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - label638: { - if (var2 != 57) { - if (var2 == 58) { - var16 = ViewportMouse.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6942(ModelData0.selectedSpellWidget); - var9.packetBuffer.method6942(var1); - var9.packetBuffer.method6931(var16.itemId); - var9.packetBuffer.method6930(Client.field647); - var9.packetBuffer.method6930(var0); - var9.packetBuffer.method7029(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - break label638; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2701, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(var3); - var8.packetBuffer.method6930(PlayerComposition.baseY + var1); - var8.packetBuffer.method6930(var0 + WorldMapSectionType.baseX); - var8.packetBuffer.method7066(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - break label638; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2693, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7029(var3); - Client.packetWriter.addNode(var8); - break label638; - } - - if (var2 == 1003) { - 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) { - var11 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2759, Client.packetWriter.isaacCipher); - var11.packetBuffer.method6931(var17.id); - Client.packetWriter.addNode(var11); - } - } - break label638; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2751, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6930(var3); - Client.packetWriter.addNode(var8); - break label638; - } - - if (var2 == 1005) { - var16 = HealthBarUpdate.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - GraphicsDefaults.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class87.ItemDefinition_get(var3).name); - } else { - var9 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2751, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6930(var3); - Client.packetWriter.addNode(var9); - } - - Client.field620 = 0; - class7.field31 = HealthBarUpdate.getWidget(var1); - Client.field597 = var0; - break label638; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1011 || var2 == 1008 || var2 == 1012 || var2 == 1010) { - TileItem.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label638; - } - } - - var16 = ViewportMouse.getWidgetChild(var1, var0); - if (var16 != null) { - ReflectionCheck.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - class16.invalidateWidget(HealthBarUpdate.getWidget(UserComparator6.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - class258.Widget_runOnTargetLeave(); - } - - if (class7.field31 != null && Client.field620 == 0) { - class16.invalidateWidget(class7.field31); - } - + byte var1 = 39; // L: 124 + String var4 = this.field4098; // L: 127 + int var3 = var4.length() + 2; // L: 129 + int var23 = var1 + var3; // L: 131 + String var7 = this.field4099; // L: 134 + int var6 = var7.length() + 2; // L: 136 + var23 += var6; // L: 138 + String var10 = this.field4106; // L: 141 + int var9 = var10.length() + 2; // L: 143 + var23 += var9; // L: 145 + String var13 = this.field4107; // L: 148 + int var12 = var13.length() + 2; // L: 150 + var23 += var12; // L: 152 + String var16 = this.field4105; // L: 155 + int var15 = var16.length() + 2; // L: 157 + var23 += var15; // L: 159 + String var19 = this.field4113; // L: 162 + int var18 = var19.length() + 2; // L: 164 + var23 += var18; // L: 166 + String var22 = this.field4116; // L: 169 + int var21 = var22.length() + 2; // L: 171 + var23 += var21; // L: 173 + return var23; // L: 174 } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 35d41bfe21..494efc99b3 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nk") +@ObfuscatedName("nm") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lnr;", - garbageValue = "-1957452301" + descriptor = "(I)Lnp;", + garbageValue = "-1940365419" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index dd9dd18aae..c74150d24b 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -4,577 +4,537 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cx") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpb;" ) @Export("username") Username username; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lit;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1051269069 + intValue = -1696994265 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1768904761 + intValue = -2126802757 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("actions") String[] actions; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1150967033 + intValue = -937184137 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1021404595 + intValue = 1332697309 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 78214381 + intValue = 337451977 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 918727087 + intValue = -1425054189 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1671660339 + intValue = 1458184293 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -924564511 + intValue = 288875039 ) - int field1087; - @ObfuscatedName("g") + int field1042; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 201682335 + intValue = 332788461 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -236914309 + intValue = 13115945 ) - int field1070; - @ObfuscatedName("s") + int field1052; + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lhl;" ) @Export("model0") Model model0; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1035892391 + intValue = 1775444559 ) @Export("minX") int minX; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2014633579 + intValue = 1238271901 ) @Export("minY") int minY; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1248260379 + intValue = -1266032001 ) @Export("maxX") int maxX; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1768054799 + intValue = 1322091437 ) @Export("maxY") int maxY; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1848750593 + intValue = -928304435 ) @Export("team") int team; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("isHidden") boolean isHidden; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1789077761 + intValue = 1357016489 ) @Export("plane") int plane; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2000058311 + intValue = 416153075 ) @Export("index") int index; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ad") - boolean field1060; - @ObfuscatedName("as") + @ObfuscatedName("ae") + boolean field1067; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1518425549 + intValue = -308953969 ) @Export("tileX") int tileX; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1990098543 + intValue = -699519147 ) @Export("tileY") int tileY; Player() { - this.headIconPk = -1; - this.headIconPrayer = -1; - this.actions = new String[3]; + this.headIconPk = -1; // L: 20 + this.headIconPrayer = -1; // L: 21 + this.actions = new String[3]; // L: 23 - for (int var1 = 0; var1 < 3; ++var1) { + for (int var1 = 0; var1 < 3; ++var1) { // L: 26 this.actions[var1] = ""; } - 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.field1060 = false; - } + 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.field1067 = false; // L: 50 + } // L: 54 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-1541664871" + descriptor = "(Lop;I)V", + garbageValue = "-1757625786" ) @Export("read") final void read(Buffer var1) { - 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]; + 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 int var6; int var7; int var8; - for (int var5 = 0; var5 < 12; ++var5) { - var6 = var1.readUnsignedByte(); - if (var6 == 0) { - var4[var5] = 0; + for (int var5 = 0; var5 < 12; ++var5) { // L: 64 + var6 = var1.readUnsignedByte(); // L: 65 + if (var6 == 0) { // L: 66 + var4[var5] = 0; // L: 67 } else { - var7 = var1.readUnsignedByte(); - var4[var5] = var7 + (var6 << 8); - if (var5 == 0 && var4[0] == 65535) { - var3 = var1.readUnsignedShort(); + 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 break; } - if (var4[var5] >= 512) { - var8 = class87.ItemDefinition_get(var4[var5] - 512).team; - if (var8 != 0) { + if (var4[var5] >= 512) { // L: 76 + var8 = TaskHandler.ItemDefinition_get(var4[var5] - 512).team; // L: 77 + if (var8 != 0) { // L: 78 this.team = var8; } } } } - int[] var24 = new int[5]; + int[] var11 = new int[5]; // L: 81 - for (var6 = 0; var6 < 5; ++var6) { - var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= class185.field2101[var6].length) { + for (var6 = 0; var6 < 5; ++var6) { // L: 82 + var7 = var1.readUnsignedByte(); // L: 83 + if (var7 < 0 || var7 >= class137.field1519[var6].length) { // L: 84 var7 = 0; } - var24[var6] = var7; + var11[var6] = var7; // L: 85 } - super.idleSequence = var1.readUnsignedShort(); - if (super.idleSequence == 65535) { + super.idleSequence = var1.readUnsignedShort(); // L: 87 + if (super.idleSequence == 65535) { // L: 88 super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); - if (super.turnLeftSequence == 65535) { + super.turnLeftSequence = var1.readUnsignedShort(); // L: 89 + if (super.turnLeftSequence == 65535) { // L: 90 super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.readUnsignedShort(); - if (super.walkSequence == 65535) { + super.turnRightSequence = super.turnLeftSequence; // L: 91 + super.walkSequence = var1.readUnsignedShort(); // L: 92 + if (super.walkSequence == 65535) { // L: 93 super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); - if (super.walkBackSequence == 65535) { + super.walkBackSequence = var1.readUnsignedShort(); // L: 94 + if (super.walkBackSequence == 65535) { // L: 95 super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); - if (super.walkLeftSequence == 65535) { + super.walkLeftSequence = var1.readUnsignedShort(); // L: 96 + if (super.walkLeftSequence == 65535) { // L: 97 super.walkLeftSequence = -1; } - super.walkRightSequence = var1.readUnsignedShort(); - if (super.walkRightSequence == 65535) { + super.walkRightSequence = var1.readUnsignedShort(); // L: 98 + if (super.walkRightSequence == 65535) { // L: 99 super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); - if (super.runSequence == 65535) { + super.runSequence = var1.readUnsignedShort(); // L: 100 + if (super.runSequence == 65535) { // L: 101 super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapSectionType.loginType); - this.clearIsFriend(); - this.clearIsInFriendsChat(); - this.method2127(); - if (this == class67.localPlayer) { + this.username = new Username(var1.readStringCp1252NullTerminated(), GrandExchangeOfferUnitPriceComparator.loginType); // L: 102 + this.clearIsFriend(); // L: 103 + this.clearIsInFriendsChat(); // L: 104 + this.method2105(); // L: 105 + if (this == HealthBarDefinition.localPlayer) { // L: 106 RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { + 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.isHidden = false; } - class150[] var25 = null; - boolean var26 = false; - if (var1.offset < var1.array.length) { - var8 = var1.readUnsignedShort(); - var26 = (var8 >> 15 & 1) == 1; - if (var8 > 0 && var8 != 32768) { - var25 = new class150[12]; + class150[] 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 class150[12]; // L: 117 - for (int var9 = 0; var9 < 12; ++var9) { - int var10 = var8 >> 12 - var9 & 1; - if (var10 == 1) { - int var14 = var4[var9] - 512; - int var15 = var1.readUnsignedByte(); - boolean var16 = (var15 & 1) != 0; - boolean var17 = (var15 & 2) != 0; - class150 var18 = new class150(var14); - int var19; - int[] var20; - boolean var21; - int var22; - short var23; - if (var16) { - var19 = var1.readUnsignedByte(); - var20 = new int[]{var19 & 15, var19 >> 4 & 15}; - var21 = var18.field1606 != null && var20.length == var18.field1606.length; - - for (var22 = 0; var22 < 2; ++var22) { - if (var20[var22] != 15) { - var23 = (short)var1.readUnsignedShort(); - if (var21) { - var18.field1606[var20[var22]] = var23; - } - } - } - } - - if (var17) { - var19 = var1.readUnsignedByte(); - var20 = new int[]{var19 & 15, var19 >> 4 & 15}; - var21 = var18.field1607 != null && var20.length == var18.field1607.length; - - for (var22 = 0; var22 < 2; ++var22) { - if (var20[var22] != 15) { - var23 = (short)var1.readUnsignedShort(); - if (var21) { - var18.field1607[var20[var22]] = var23; - } - } - } - } - - var25[var9] = var18; + for (int var9 = 0; var9 < 12; ++var9) { // L: 118 + int var10 = var8 >> 12 - var9 & 1; // L: 119 + if (var10 == 1) { // L: 120 + var12[var9] = NPCComposition.method3152(var4[var9] - 512, var1); // L: 121 } } } } - if (this.appearance == null) { + if (this.appearance == null) { // L: 126 this.appearance = new PlayerComposition(); } - this.appearance.method4954(var4, var25, var26, var24, var2 == 1, var3); - } + this.appearance.method5062(var4, var12, var13, var11, var2 == 1, var3); // L: 127 + } // L: 128 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { + if (this.appearance == null) { // L: 189 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? KitDefinition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : KitDefinition.SequenceDefinition_get(super.movementSequence); - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? MouseHandler.SequenceDefinition_get(super.sequence) : null; // L: 190 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : MouseHandler.SequenceDefinition_get(super.movementSequence); // L: 191 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 192 + if (var3 == null) { // L: 193 return null; } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; + var3.calculateBoundsCylinder(); // L: 194 + super.defaultHeight = var3.height; // L: 195 Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = class21.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.field1147, 0); - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 196 + var4 = BZip2State.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 197 + if (var4 != null) { // L: 198 + var4.offsetBy(0, -super.field1126, 0); // L: 199 + var5 = new Model[]{var3, var4}; // L: 200 + var3 = new Model(var5, 2); // L: 201 } } - if (!this.isUnanimated && this.model0 != null) { - if (Client.cycle >= this.animationCycleEnd) { + if (!this.isUnanimated && this.model0 != null) { // L: 204 + if (Client.cycle >= this.animationCycleEnd) { // L: 205 this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { - var4 = this.model0; - var4.offsetBy(this.field1087 - super.x, this.tileHeight2 - this.tileHeight, this.field1070 - 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) { + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 206 + var4 = this.model0; // L: 207 + var4.offsetBy(this.field1042 - super.x, this.tileHeight2 - this.tileHeight, this.field1052 - 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 var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); + var5 = new Model[]{var3, var4}; // L: 219 + var3 = new Model(var5, 2); // L: 220 + if (super.orientation == 512) { // L: 221 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.field1087, this.tileHeight - this.tileHeight2, super.y - this.field1070); + var4.offsetBy(super.x - this.field1042, this.tileHeight - this.tileHeight2, super.y - this.field1052); // L: 231 } } - var3.isSingleTile = true; - return var3; + var3.isSingleTile = true; // L: 234 + return var3; // L: 235 } } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1896228975" + descriptor = "(B)Z", + garbageValue = "45" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { - this.checkIsFriend(); + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 + this.checkIsFriend(); // L: 132 } - return this.isFriendTriBool == TriBool.TriBool_true; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-326576513" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "20" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = Message.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2035950911" - ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { - this.updateIsInFriendsChat(); - } - - return this.isInFriendsChat == TriBool.TriBool_true; + return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 } @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-49500709" + garbageValue = "426200775" + ) + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 + } // L: 139 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "942612760" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = class112.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 + } // L: 143 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "220303243" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 + this.updateIsInFriendsChat(); // L: 147 + } + + return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-1" ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("updateIsInFriendsChat") - void updateIsInFriendsChat() { - this.isInFriendsChat = class264.friendsChat != null && class264.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1547987750" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - for (int var1 = 0; var1 < 2; ++var1) { - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2584(this.username.getName()) != -1) { - this.isInClanChat = TriBool.TriBool_true; - return; - } - } - - this.isInClanChat = TriBool.TriBool_false; - } + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153 + } // L: 154 @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "579888047" ) - void method2127() { - this.isInClanChat = TriBool.TriBool_unknown; - } + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = AbstractArchive.friendsChat != null && AbstractArchive.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157 + } // L: 158 - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1535473073" + descriptor = "(I)V", + garbageValue = "-396296136" + ) + @Export("updateIsInClanChat") + void updateIsInClanChat() { + for (int var1 = 0; var1 < 2; ++var1) { // L: 161 + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2649(this.username.getName()) != -1) { // L: 162 + this.isInClanChat = TriBool.TriBool_true; // L: 163 + return; // L: 164 + } + } + + this.isInClanChat = TriBool.TriBool_false; // L: 167 + } // L: 168 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "25" + ) + void method2105() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 171 + } // L: 172 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" ) @Export("isClanMember") boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { - this.updateIsInClanChat(); + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 175 + this.updateIsInClanChat(); // L: 176 } - return this.isInClanChat == TriBool.TriBool_true; + return this.isInClanChat == TriBool.TriBool_true; // L: 178 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "16777215" + descriptor = "(B)I", + garbageValue = "82" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class112.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? ScriptFrame.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIBB)V", - garbageValue = "39" + descriptor = "(IIBI)V", + garbageValue = "-1013246003" ) - final void method2092(int var1, int var2, byte var3) { - if (super.sequence != -1 && KitDefinition.SequenceDefinition_get(super.sequence).field1960 == 1) { + final void method2109(int var1, int var2, byte var3) { + if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 239 super.sequence = -1; } - super.field1134 = -1; - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { - if (var3 == 2) { - Player var4 = this; - int var5 = super.pathX[0]; - int var6 = super.pathY[0]; - int var7 = this.transformedSize(); - if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { - int var9 = this.transformedSize(); - Client.field649.approxDestinationX = var1; - Client.field649.approxDestinationY = var2; - Client.field649.approxDestinationSizeX = 1; - Client.field649.approxDestinationSizeY = 1; - ApproximateRouteStrategy var10 = Client.field649; - ApproximateRouteStrategy var11 = var10; - CollisionMap var12 = Client.collisionMaps[this.plane]; - int[] var13 = Client.field668; - int[] var14 = Client.field491; + super.field1112 = -1; // L: 240 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 241 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 242 + if (var3 == 2) { // L: 244 + Player var4 = this; // L: 245 + int var5 = super.pathX[0]; // L: 247 + int var6 = super.pathY[0]; // L: 248 + int var7 = this.transformedSize(); // L: 249 + if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 250 251 + int var9 = this.transformedSize(); // L: 253 + Client.field743.approxDestinationX = var1; // L: 256 + Client.field743.approxDestinationY = var2; // L: 257 + Client.field743.approxDestinationSizeX = 1; // L: 258 + Client.field743.approxDestinationSizeY = 1; // L: 259 + ApproximateRouteStrategy var10 = Client.field743; // L: 260 + ApproximateRouteStrategy var11 = var10; // L: 262 + CollisionMap var12 = Client.collisionMaps[this.plane]; // L: 263 + int[] var13 = Client.field538; // L: 264 + int[] var14 = Client.field748; // L: 265 int var15 = 0; - label378: + label381: while (true) { int var16; if (var15 >= 128) { @@ -591,239 +551,239 @@ public final class Player extends Actor { int var37; int var38; int var40; - if (var9 == 1) { - var17 = var5; - var18 = var6; - byte var19 = 64; - var20 = 64; - var21 = var5 - var19; - var22 = var6 - var20; - class174.directions[var19][var20] = 99; - class174.distances[var19][var20] = 0; - byte var23 = 0; - var24 = 0; - class174.bufferX[var23] = var5; + if (var9 == 1) { // L: 274 + var17 = var5; // L: 277 + var18 = var6; // L: 278 + byte var19 = 64; // L: 279 + var20 = 64; // L: 280 + var21 = var5 - var19; // L: 281 + var22 = var6 - var20; // L: 282 + class174.directions[var19][var20] = 99; // L: 283 + class174.distances[var19][var20] = 0; // L: 284 + byte var23 = 0; // L: 285 + var24 = 0; // L: 286 + class174.bufferX[var23] = var5; // L: 287 var40 = var23 + 1; - class174.bufferY[var23] = var6; - int[][] var25 = var12.flags; + class174.bufferY[var23] = var6; // L: 288 + int[][] var25 = var12.flags; // L: 289 boolean var36; while (true) { - if (var24 == var40) { - class318.field3870 = var17; - class174.field1994 = var18; - var36 = false; + if (var24 == var40) { // L: 292 + RouteStrategy.field1979 = var17; // L: 364 + class67.field845 = var18; // L: 365 + var36 = false; // L: 366 break; } - var17 = class174.bufferX[var24]; - var18 = class174.bufferY[var24]; - var24 = var24 + 1 & 4095; - var37 = var17 - var21; - var38 = var18 - var22; - var26 = var17 - var12.xInset; - var27 = var18 - var12.yInset; - if (var11.hasArrived(1, var17, var18, var12)) { - class318.field3870 = var17; - class174.field1994 = var18; - var36 = true; + var17 = class174.bufferX[var24]; // L: 293 + var18 = class174.bufferY[var24]; // L: 294 + var24 = var24 + 1 & 4095; // L: 295 + var37 = var17 - var21; // L: 296 + var38 = var18 - var22; // L: 297 + var26 = var17 - var12.xInset; // L: 298 + var27 = var18 - var12.yInset; // L: 299 + if (var11.hasArrived(1, var17, var18, var12)) { // L: 300 + RouteStrategy.field1979 = var17; // L: 301 + class67.field845 = var18; // L: 302 + var36 = true; // L: 303 break; } - var28 = class174.distances[var37][var38] + 1; - if (var37 > 0 && class174.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136776) == 0) { - class174.bufferX[var40] = var17 - 1; - class174.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class174.directions[var37 - 1][var38] = 2; - class174.distances[var37 - 1][var38] = var28; + var28 = class174.distances[var37][var38] + 1; // L: 306 + if (var37 > 0 && class174.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136776) == 0) { // L: 307 + class174.bufferX[var40] = var17 - 1; // L: 308 + class174.bufferY[var40] = var18; // L: 309 + var40 = var40 + 1 & 4095; // L: 310 + class174.directions[var37 - 1][var38] = 2; // L: 311 + class174.distances[var37 - 1][var38] = var28; // L: 312 } - if (var37 < 127 && class174.directions[var37 + 1][var38] == 0 && (var25[var26 + 1][var27] & 19136896) == 0) { - class174.bufferX[var40] = var17 + 1; - class174.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class174.directions[var37 + 1][var38] = 8; - class174.distances[var37 + 1][var38] = var28; + if (var37 < 127 && class174.directions[var37 + 1][var38] == 0 && (var25[var26 + 1][var27] & 19136896) == 0) { // L: 314 + class174.bufferX[var40] = var17 + 1; // L: 315 + class174.bufferY[var40] = var18; // L: 316 + var40 = var40 + 1 & 4095; // L: 317 + class174.directions[var37 + 1][var38] = 8; // L: 318 + class174.distances[var37 + 1][var38] = var28; // L: 319 } - if (var38 > 0 && class174.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { - class174.bufferX[var40] = var17; - class174.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class174.directions[var37][var38 - 1] = 1; - class174.distances[var37][var38 - 1] = var28; + if (var38 > 0 && class174.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 321 + class174.bufferX[var40] = var17; // L: 322 + class174.bufferY[var40] = var18 - 1; // L: 323 + var40 = var40 + 1 & 4095; // L: 324 + class174.directions[var37][var38 - 1] = 1; // L: 325 + class174.distances[var37][var38 - 1] = var28; // L: 326 } - if (var38 < 127 && class174.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { - class174.bufferX[var40] = var17; - class174.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class174.directions[var37][var38 + 1] = 4; - class174.distances[var37][var38 + 1] = var28; + if (var38 < 127 && class174.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 328 + class174.bufferX[var40] = var17; // L: 329 + class174.bufferY[var40] = var18 + 1; // L: 330 + var40 = var40 + 1 & 4095; // L: 331 + class174.directions[var37][var38 + 1] = 4; // L: 332 + class174.distances[var37][var38 + 1] = var28; // L: 333 } - if (var37 > 0 && var38 > 0 && class174.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { - class174.bufferX[var40] = var17 - 1; - class174.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class174.directions[var37 - 1][var38 - 1] = 3; - class174.distances[var37 - 1][var38 - 1] = var28; + if (var37 > 0 && var38 > 0 && class174.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 335 + class174.bufferX[var40] = var17 - 1; // L: 336 + class174.bufferY[var40] = var18 - 1; // L: 337 + var40 = var40 + 1 & 4095; // L: 338 + class174.directions[var37 - 1][var38 - 1] = 3; // L: 339 + class174.distances[var37 - 1][var38 - 1] = var28; // L: 340 } - if (var37 < 127 && var38 > 0 && class174.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { - class174.bufferX[var40] = var17 + 1; - class174.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class174.directions[var37 + 1][var38 - 1] = 9; - class174.distances[var37 + 1][var38 - 1] = var28; + if (var37 < 127 && var38 > 0 && class174.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 342 + class174.bufferX[var40] = var17 + 1; // L: 343 + class174.bufferY[var40] = var18 - 1; // L: 344 + var40 = var40 + 1 & 4095; // L: 345 + class174.directions[var37 + 1][var38 - 1] = 9; // L: 346 + class174.distances[var37 + 1][var38 - 1] = var28; // L: 347 } - if (var37 > 0 && var38 < 127 && class174.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { - class174.bufferX[var40] = var17 - 1; - class174.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class174.directions[var37 - 1][var38 + 1] = 6; - class174.distances[var37 - 1][var38 + 1] = var28; + if (var37 > 0 && var38 < 127 && class174.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 349 + class174.bufferX[var40] = var17 - 1; // L: 350 + class174.bufferY[var40] = var18 + 1; // L: 351 + var40 = var40 + 1 & 4095; // L: 352 + class174.directions[var37 - 1][var38 + 1] = 6; // L: 353 + class174.distances[var37 - 1][var38 + 1] = var28; // L: 354 } - if (var37 < 127 && var38 < 127 && class174.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 1] & 19136992) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { - class174.bufferX[var40] = var17 + 1; - class174.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class174.directions[var37 + 1][var38 + 1] = 12; - class174.distances[var37 + 1][var38 + 1] = var28; + if (var37 < 127 && var38 < 127 && class174.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 1] & 19136992) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 356 + class174.bufferX[var40] = var17 + 1; // L: 357 + class174.bufferY[var40] = var18 + 1; // L: 358 + var40 = var40 + 1 & 4095; // L: 359 + class174.directions[var37 + 1][var38 + 1] = 12; // L: 360 + class174.distances[var37 + 1][var38 + 1] = var28; // L: 361 } } - var35 = var36; - } else if (var9 == 2) { - var35 = Canvas.method381(var5, var6, var10, var12); + var35 = var36; // L: 368 + } else if (var9 == 2) { // L: 370 + var35 = WorldMapRectangle.method3959(var5, var6, var10, var12); } else { - var35 = class129.method2673(var5, var6, var9, var10, var12); + var35 = class318.method5874(var5, var6, var9, var10, var12); // L: 371 } int var8; - label401: { - var16 = var5 - 64; - var17 = var6 - 64; - var18 = class318.field3870; - var37 = class174.field1994; - if (!var35) { - var38 = Integer.MAX_VALUE; - var21 = Integer.MAX_VALUE; - byte var39 = 10; - var40 = var11.approxDestinationX; - var24 = var11.approxDestinationY; - int var34 = var11.approxDestinationSizeX; - var26 = var11.approxDestinationSizeY; + label404: { + var16 = var5 - 64; // L: 372 + var17 = var6 - 64; // L: 373 + var18 = RouteStrategy.field1979; // L: 374 + var37 = class67.field845; // L: 375 + if (!var35) { // L: 376 + var38 = Integer.MAX_VALUE; // L: 378 + var21 = Integer.MAX_VALUE; // L: 379 + byte var39 = 10; // L: 380 + var40 = var11.approxDestinationX; // L: 381 + var24 = var11.approxDestinationY; // L: 382 + int var34 = var11.approxDestinationSizeX; // L: 383 + var26 = var11.approxDestinationSizeY; // L: 384 - for (var27 = var40 - var39; var27 <= var40 + var39; ++var27) { - for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { - int var29 = var27 - var16; - int var30 = var28 - var17; - if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class174.distances[var29][var30] < 100) { - int var31 = 0; - if (var27 < var40) { + for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 385 + for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { // L: 386 + int var29 = var27 - var16; // L: 387 + int var30 = var28 - var17; // L: 388 + if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class174.distances[var29][var30] < 100) { // L: 389 390 + int var31 = 0; // L: 391 + if (var27 < var40) { // L: 392 var31 = var40 - var27; - } else if (var27 > var40 + var34 - 1) { - var31 = var27 - (var34 + var40 - 1); + } else if (var27 > var40 + var34 - 1) { // L: 393 + var31 = var27 - (var40 + var34 - 1); } - int var32 = 0; - if (var28 < var24) { + int var32 = 0; // L: 394 + if (var28 < var24) { // L: 395 var32 = var24 - var28; - } else if (var28 > var24 + var26 - 1) { - var32 = var28 - (var26 + var24 - 1); + } else if (var28 > var26 + var24 - 1) { // L: 396 + var32 = var28 - (var24 + var26 - 1); } - int var33 = var31 * var31 + var32 * var32; - if (var33 < var38 || var38 == var33 && class174.distances[var29][var30] < var21) { - var38 = var33; - var21 = class174.distances[var29][var30]; - var18 = var27; - var37 = var28; + int var33 = var31 * var31 + var32 * var32; // L: 397 + if (var33 < var38 || var38 == var33 && class174.distances[var29][var30] < var21) { // L: 398 + var38 = var33; // L: 399 + var21 = class174.distances[var29][var30]; // L: 400 + var18 = var27; // L: 401 + var37 = var28; // L: 402 } } } } - if (var38 == Integer.MAX_VALUE) { - var8 = -1; - break label401; + if (var38 == Integer.MAX_VALUE) { // L: 408 + var8 = -1; // L: 409 + break label404; } } - if (var5 == var18 && var37 == var6) { - var8 = 0; + if (var18 == var5 && var37 == var6) { // L: 418 + var8 = 0; // L: 419 } else { - var20 = 0; - class174.bufferX[var20] = var18; + var20 = 0; // L: 422 + class174.bufferX[var20] = var18; // L: 425 var38 = var20 + 1; - class174.bufferY[var20] = var37; + class174.bufferY[var20] = var37; // L: 426 - for (var21 = var22 = class174.directions[var18 - var16][var37 - var17]; var5 != var18 || var6 != var37; var21 = class174.directions[var18 - var16][var37 - var17]) { - if (var22 != var21) { - var22 = var21; - class174.bufferX[var38] = var18; - class174.bufferY[var38++] = var37; + for (var21 = var22 = class174.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class174.directions[var18 - var16][var37 - var17]) { // L: 427 428 438 + if (var22 != var21) { // L: 429 + var22 = var21; // L: 430 + class174.bufferX[var38] = var18; // L: 431 + class174.bufferY[var38++] = var37; // L: 432 } - if ((var21 & 2) != 0) { + if ((var21 & 2) != 0) { // L: 434 ++var18; - } else if ((var21 & 8) != 0) { + } else if ((var21 & 8) != 0) { // L: 435 --var18; } - if ((var21 & 1) != 0) { + if ((var21 & 1) != 0) { // L: 436 ++var37; - } else if ((var21 & 4) != 0) { + } else if ((var21 & 4) != 0) { // L: 437 --var37; } } - var40 = 0; + var40 = 0; // L: 440 - while (var38-- > 0) { - var13[var40] = class174.bufferX[var38]; - var14[var40++] = class174.bufferY[var38]; - if (var40 >= var13.length) { + while (var38-- > 0) { // L: 441 + var13[var40] = class174.bufferX[var38]; // L: 442 + var14[var40++] = class174.bufferY[var38]; // L: 443 + if (var40 >= var13.length) { // L: 444 break; } } - var8 = var40; + var8 = var40; // L: 446 } } - var15 = var8; - if (var8 < 1) { + var15 = var8; // L: 448 + if (var8 < 1) { // L: 449 break; } - var16 = 0; + var16 = 0; // L: 450 while (true) { if (var16 >= var15 - 1) { - break label378; + break label381; } - var4.method2094(Client.field668[var16], Client.field491[var16], (byte)2); + var4.method2111(Client.field538[var16], Client.field748[var16], (byte)2); ++var16; } } - for (var16 = 0; var16 < 128; ++var16) { - class174.directions[var15][var16] = 0; - class174.distances[var15][var16] = 99999999; + for (var16 = 0; var16 < 128; ++var16) { // L: 268 + class174.directions[var15][var16] = 0; // L: 269 + class174.distances[var15][var16] = 99999999; // L: 270 } - ++var15; + ++var15; // L: 267 } } } - this.method2094(var1, var2, var3); + this.method2111(var1, var2, var3); // L: 453 } else { this.resetPath(var1, var2); } @@ -831,945 +791,98 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } + } // L: 455 - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-725905590" + garbageValue = "107443252" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; - super.field1129 = 0; - super.field1164 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - int var3 = this.transformedSize(); - super.x = super.pathX[0] * 128 + var3 * 64; - super.y = var3 * 64 + super.pathY[0] * 128; - } + super.pathLength = 0; // L: 458 + super.field1144 = 0; // L: 459 + super.field1085 = 0; // L: 460 + super.pathX[0] = var1; // L: 461 + super.pathY[0] = var2; // L: 462 + int var3 = this.transformedSize(); // L: 463 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 464 + super.y = super.pathY[0] * 128 + var3 * 64; // L: 465 + } // L: 466 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "1407598778" + garbageValue = "1234210425" ) - final void method2094(int var1, int var2, byte var3) { - if (super.pathLength < 9) { + final void method2111(int var1, int var2, byte var3) { + if (super.pathLength < 9) { // L: 469 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { - super.pathX[var4] = super.pathX[var4 - 1]; - super.pathY[var4] = super.pathY[var4 - 1]; - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 470 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 471 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 472 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 473 } - super.pathX[0] = var1; - super.pathY[0] = var2; - super.pathTraversed[0] = var3; - } + super.pathX[0] = var1; // L: 475 + super.pathY[0] = var2; // L: 476 + super.pathTraversed[0] = var3; // L: 477 + } // L: 478 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1841514183" + garbageValue = "-532391824" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Loy;ILci;II)V", - garbageValue = "-1673892976" - ) - static final void method2133(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - int var5; - if ((var3 & 8192) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 1024) != 0) { - Players.field1245[var1] = var0.readByte(); - } - - if ((var3 & 4) != 0) { - var2.targetIndex = var0.method6933(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 256) != 0) { - var2.field1148 = var0.method6915(); - var2.field1126 = var0.method6915(); - var2.field1149 = var0.method6929(); - var2.field1125 = var0.method6929(); - var2.field1145 = var0.method6933() + Client.cycle; - var2.field1165 = var0.method6933() + Client.cycle; - var2.field1151 = var0.method6934(); - if (var2.field1060) { - var2.field1148 += var2.tileX; - var2.field1126 += var2.tileY; - var2.field1149 += var2.tileX; - var2.field1125 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field1148 += var2.pathX[0]; - var2.field1126 += var2.pathY[0]; - var2.field1149 += var2.pathX[0]; - var2.field1125 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1129 = 0; - } - - if ((var3 & 16) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - GraphicsDefaults.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == class67.localPlayer) { - GraphicsDefaults.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - int var6; - int var8; - int var9; - int var12; - if ((var3 & 32) != 0) { - var5 = var0.method6925(); - int var7; - int var10; - int var15; - 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; - } - - var15 = var0.readUShortSmart(); - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var15); - } - } - - var6 = var0.readUnsignedByte(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var15 = var0.readUnsignedByte(); - var12 = var9 > 0 ? var0.method6925() : var15; - var2.addHealthBar(var8, Client.cycle, var9, var10, var15, var12); - } else { - var2.removeHealthBar(var8); - } - } - } - } - - if ((var3 & 8) != 0) { - var5 = var0.method6933(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.readUnsignedByte(); - SpotAnimationDefinition.performPlayerAnimation(var2, var5, var6); - } - - if ((var3 & 128) != 0) { - var5 = var0.method7059(); - PlayerType var13 = (PlayerType)class128.findEnumerated(class19.PlayerType_values(), var0.readUnsignedByte()); - boolean var17 = var0.method6927() == 1; - var8 = var0.method6926(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var18 = false; - if (var13.isUser && Message.friendSystem.isIgnored(var2.username)) { - var18 = true; - } - - if (!var18 && Client.field559 == 0 && !var2.isHidden) { - Players.field1259.offset = 0; - var0.method7021(Players.field1259.array, 0, var8); - Players.field1259.offset = 0; - String var11 = AbstractFont.escapeBrackets(Tiles.method2025(SecureRandomFuture.method1951(Players.field1259))); - var2.overheadText = var11.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var17; - var2.field1121 = var2 != class67.localPlayer && var13.isUser && "" != Client.field550 && var11.toLowerCase().indexOf(Client.field550) == -1; - if (var13.isPrivileged) { - var12 = var17 ? 91 : 1; - } else { - var12 = var17 ? 90 : 2; - } - - if (var13.modIcon != -1) { - GraphicsDefaults.addGameMessage(var12, ReflectionCheck.method1064(var13.modIcon) + var2.username.getName(), var11); - } else { - GraphicsDefaults.addGameMessage(var12, var2.username.getName(), var11); - } - } - } - - var0.offset = var9 + var8; - } - - if ((var3 & 1) != 0) { - var2.field1134 = var0.method6934(); - if (var2.pathLength == 0) { - var2.orientation = var2.field1134; - var2.field1134 = -1; - } - } - - if ((var3 & 4096) != 0) { - var2.spotAnimation = var0.method7059(); - var5 = var0.method6876(); - var2.field1147 = var5 >> 16; - var2.field1105 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field1105 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - if ((var3 & 2048) != 0) { - var4 = var0.method6915(); - } - - if ((var3 & 2) != 0) { - var5 = var0.method6927(); - byte[] var19 = new byte[var5]; - Buffer var14 = new Buffer(var19); - var0.method6947(var19, 0, var5); - Players.field1248[var1] = var14; - var2.read(var14); - } - - if (var2.field1060) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var16; - if (var4 != -1) { - var16 = var4; - } else { - var16 = Players.field1245[var1]; - } - - var2.method2092(var2.tileX, var2.tileY, var16); - } - } - + return this.appearance != null; // L: 481 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Llt;Llt;Llt;B)V", - garbageValue = "91" + descriptor = "(II)J", + garbageValue = "-665498236" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (Huffman.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class78.loginBoxCenter = Login.loginBoxX + 180; - byte var3; - int var4; - int var9; - int var11; - int var12; - int var25; - int var26; - int var28; - int var34; - if (Login.worldSelectOpen) { - if (BoundaryObject.worldSelectBackSprites == null) { - BoundaryObject.worldSelectBackSprites = Script.method1970(class176.archive8, "sl_back", ""); - } + public static long method2159(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56 + } - Archive var40; - int var42; - IndexedSprite[] var44; - int var45; - if (NetFileRequest.worldSelectFlagSprites == null) { - var40 = class176.archive8; - var42 = var40.getGroupId("sl_flags"); - var45 = var40.getFileId(var42, ""); - var44 = KitDefinition.method2934(var40, var42, var45); - NetFileRequest.worldSelectFlagSprites = var44; - } + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-763445745" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (class174.loadInterface(var0)) { // L: 11304 + Widget[] var1 = WorldMapSection1.Widget_interfaceComponents[var0]; // L: 11305 - if (EnumComposition.worldSelectArrows == null) { - var40 = class176.archive8; - var42 = var40.getGroupId("sl_arrows"); - var45 = var40.getFileId(var42, ""); - var44 = KitDefinition.method2934(var40, var42, var45); - EnumComposition.worldSelectArrows = var44; - } - - if (class320.worldSelectStars == null) { - var40 = class176.archive8; - var42 = var40.getGroupId("sl_stars"); - var45 = var40.getFileId(var42, ""); - var44 = KitDefinition.method2934(var40, var42, var45); - class320.worldSelectStars = var44; - } - - if (WorldMapCacheName.worldSelectLeftSprite == null) { - WorldMapCacheName.worldSelectLeftSprite = class131.SpriteBuffer_getIndexedSpriteByName(class176.archive8, "leftarrow", ""); - } - - if (ByteArrayPool.worldSelectRightSprite == null) { - ByteArrayPool.worldSelectRightSprite = class131.SpriteBuffer_getIndexedSpriteByName(class176.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (class320.worldSelectStars != null) { - class320.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - class320.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (EnumComposition.worldSelectArrows != null) { - var34 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - EnumComposition.worldSelectArrows[2].drawAt(var34, 4); - } else { - EnumComposition.worldSelectArrows[0].drawAt(var34, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - EnumComposition.worldSelectArrows[3].drawAt(var34 + 15, 4); - } else { - EnumComposition.worldSelectArrows[1].drawAt(var34 + 15, 4); - } - - var0.draw("World", var34 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - EnumComposition.worldSelectArrows[2].drawAt(var4, 4); - } else { - EnumComposition.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - EnumComposition.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - EnumComposition.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); - var42 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - EnumComposition.worldSelectArrows[2].drawAt(var42, 4); - } else { - EnumComposition.worldSelectArrows[0].drawAt(var42, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - EnumComposition.worldSelectArrows[3].drawAt(var42 + 15, 4); - } else { - EnumComposition.worldSelectArrows[1].drawAt(var42 + 15, 4); - } - - var0.draw("Location", var42 + 32, 17, 16777215, -1); - var45 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - EnumComposition.worldSelectArrows[2].drawAt(var45, 4); - } else { - EnumComposition.worldSelectArrows[0].drawAt(var45, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - EnumComposition.worldSelectArrows[3].drawAt(var45 + 15, 4); - } else { - EnumComposition.worldSelectArrows[1].drawAt(var45 + 15, 4); - } - - var0.draw("Type", var45 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (BoundaryObject.worldSelectBackSprites != null) { - var3 = 88; - byte var37 = 19; - var42 = 765 / (var3 + 1) - 1; - var45 = 480 / (var37 + 1); - - do { - var25 = var45; - var26 = var42; - if (var45 * (var42 - 1) >= World.World_count) { - --var42; - } - - if (var42 * (var45 - 1) >= World.World_count) { - --var45; - } - - if (var42 * (var45 - 1) >= World.World_count) { - --var45; - } - } while(var25 != var45 || var26 != var42); - - var25 = (765 - var42 * var3) / (var42 + 1); - if (var25 > 5) { - var25 = 5; - } - - var26 = (480 - var45 * var37) / (var45 + 1); - if (var26 > 5) { - var26 = 5; - } - - var9 = (765 - var42 * var3 - var25 * (var42 - 1)) / 2; - var28 = (480 - var45 * var37 - var26 * (var45 - 1)) / 2; - var11 = (var45 + World.World_count - 1) / var45; - Login.worldSelectPagesCount = var11 - var42; - if (WorldMapCacheName.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - WorldMapCacheName.worldSelectLeftSprite.drawAt(8, MouseRecorder.canvasHeight / 2 - WorldMapCacheName.worldSelectLeftSprite.subHeight / 2); - } - - if (ByteArrayPool.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - ByteArrayPool.worldSelectRightSprite.drawAt(Huffman.canvasWidth - ByteArrayPool.worldSelectRightSprite.subWidth - 8, MouseRecorder.canvasHeight / 2 - ByteArrayPool.worldSelectRightSprite.subHeight / 2); - } - - var12 = var28 + 23; - int var38 = var9 + Login.xPadding; - int var14 = 0; - boolean var15 = false; - int var16 = Login.worldSelectPage; - - int var17; - for (var17 = var16 * var45; var17 < World.World_count && var16 - Login.worldSelectPage < var42; ++var17) { - World var18 = class386.World_worlds[var17]; - boolean var19 = true; - String var20 = Integer.toString(var18.population); - if (var18.population == -1) { - var20 = "OFF"; - var19 = false; - } else if (var18.population > 1980) { - var20 = "FULL"; - var19 = false; - } - - int var22 = 0; - byte var21; - if (var18.isBeta()) { - if (var18.isMembersOnly()) { - var21 = 7; - } else { - var21 = 6; - } - } else if (var18.isDeadman()) { - var22 = 16711680; - if (var18.isMembersOnly()) { - var21 = 5; - } else { - var21 = 4; - } - } else if (var18.method1639()) { - if (var18.isMembersOnly()) { - var21 = 9; - } else { - var21 = 8; - } - } else if (var18.isPvp()) { - if (var18.isMembersOnly()) { - var21 = 3; - } else { - var21 = 2; - } - } else if (var18.isMembersOnly()) { - var21 = 1; - } else { - var21 = 0; - } - - if (MouseHandler.MouseHandler_x >= var38 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var3 + var38 && MouseHandler.MouseHandler_y < var37 + var12 && var19) { - Login.hoveredWorldIndex = var17; - BoundaryObject.worldSelectBackSprites[var21].drawTransOverlayAt(var38, var12, 128, 16777215); - var15 = true; - } else { - BoundaryObject.worldSelectBackSprites[var21].drawAt(var38, var12); - } - - if (NetFileRequest.worldSelectFlagSprites != null) { - NetFileRequest.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var38 + 29, var12); - } - - var0.drawCentered(Integer.toString(var18.id), var38 + 15, var37 / 2 + var12 + 5, var22, -1); - var1.drawCentered(var20, var38 + 60, var37 / 2 + var12 + 5, 268435455, -1); - var12 = var12 + var26 + var37; - ++var14; - if (var14 >= var45) { - var12 = var28 + 23; - var38 = var38 + var25 + var3; - var14 = 0; - ++var16; - } - } - - if (var15) { - var17 = var1.stringWidth(class386.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var32 = var1.ascent + 8; - int var39 = MouseHandler.MouseHandler_y + 25; - if (var32 + var39 > 480) { - var39 = MouseHandler.MouseHandler_y - 25 - var32; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 0); - var1.drawCentered(class386.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var39 + var1.ascent + 4, 0, -1); - } - } - - class244.rasterProvider.drawFull(0, 0); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - ClanChannelMember.logoSprite.drawAt(Login.xPadding + 382 - ClanChannelMember.logoSprite.subWidth / 2, 18); - if (Client.gameState == 0 || Client.gameState == 5) { - var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var6; - String var7; - String var8; - short var33; - short var35; - if (Client.gameState == 20) { - SoundCache.titleboxSprite.drawAt(Login.loginBoxX + 180 - SoundCache.titleboxSprite.subWidth / 2, 271 - SoundCache.titleboxSprite.subHeight / 2); - var33 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var34 += 7; - if (Login.loginIndex != 4 && Login.loginIndex != 10) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var34, 16777215, 0); - var35 = 200; - if (WorldMapDecorationType.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = StructComposition.method3152('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(0, var6.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var34, 16777215, 0); - var34 += 15; - - for (var7 = class129.method2670(Login.Login_password); var0.stringWidth(var7) > var35; var7 = var7.substring(1)) { - } - - var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var34, 16777215, 0); - var34 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - SoundCache.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var23; - if (Login.loginIndex == 0) { - var33 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 30; - var4 = Login.loginBoxX + 180 - 80; - var23 = 291; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var33 = 201; - var0.drawCentered(Login.Login_response1, class78.loginBoxCenter, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, class78.loginBoxCenter, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, class78.loginBoxCenter, var34, 16776960, 0); - var34 += 15; - var34 += 7; - var0.draw("Login: ", class78.loginBoxCenter - 110, var34, 16777215, 0); - var35 = 200; - if (WorldMapDecorationType.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = StructComposition.method3152('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? FloorUnderlayDefinition.colorStartTag(16776960) + "|" : ""), class78.loginBoxCenter - 70, var34, 16777215, 0); - var34 += 15; - var8 = Login.Login_password; - var7 = StructComposition.method3152('*', var8.length()); - - String var27; - for (var27 = var7; var0.stringWidth(var27) > var35; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? FloorUnderlayDefinition.colorStartTag(16776960) + "|" : ""), class78.loginBoxCenter - 108, var34, 16777215, 0); - var34 += 15; - var33 = 277; - var28 = class78.loginBoxCenter + -117; - IndexedSprite var29 = Script.method1955(Client.Login_isUsernameRemembered, Login.field904); - var29.drawAt(var28, var33); - var28 = var28 + var29.subWidth + 5; - var1.draw("Remember username", var28, var33 + 13, 16776960, 0); - var28 = class78.loginBoxCenter + 24; - var29 = Script.method1955(WorldMapDecorationType.clientPreferences.hideUsername, Login.field895); - var29.drawAt(var28, var33); - var28 = var28 + var29.subWidth + 5; - var1.draw("Hide username", var28, var33 + 13, 16776960, 0); - var34 = var33 + 15; - var12 = class78.loginBoxCenter - 80; - short var13 = 321; - class132.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); - var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); - var12 = class78.loginBoxCenter + 80; - class132.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); - var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); - var33 = 357; - switch(Login.field869) { - case 2: - Login.field894 = "Having trouble logging in?"; - break; - default: - Login.field894 = "Can't login? Click here."; - } - - Ignored.field3969 = new Bounds(class78.loginBoxCenter, var33, var1.stringWidth(Login.field894), 11); - class13.field76 = new Bounds(class78.loginBoxCenter, var33, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(Login.field894, class78.loginBoxCenter, var33, 16777215, 0); - } else if (Login.loginIndex == 3) { - var33 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 276; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var23 = 326; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); - } else { - String var5; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var5 = "PIN: "; - var7 = Ignored.otp; - var6 = StructComposition.method3152('*', var7.length()); - var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? FloorUnderlayDefinition.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var34, 16777215, 0); - var34 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var34, 16776960, 0); - var34 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var34, 16776960, 0); - var26 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; - var9 = var34 - var0.ascent; - IndexedSprite var10; - if (Login.field900) { - var10 = FileSystem.options_buttons_2Sprite; - } else { - var10 = class397.options_buttons_0Sprite; - } - - var10.drawAt(var26, var9); - var34 += 15; - var11 = Login.loginBoxX + 180 - 80; - short var36 = 321; - class132.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); - var0.drawCentered("Continue", var11, var36 + 5, 16777215, 0); - var11 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); - var0.drawCentered("Cancel", var11, var36 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var36 + 36, 255, 0); - } else { - short var43; - if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var33 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var34 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var34, 16777215, 0); - var35 = 174; - if (WorldMapDecorationType.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = StructComposition.method3152('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? FloorUnderlayDefinition.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var34, 16777215, 0); - var34 += 15; - var25 = Login.loginBoxX + 180 - 80; - var43 = 321; - class132.titlebuttonSprite.drawAt(var25 - 73, var43 - 20); - var0.drawCentered("Recover", var25, var43 + 5, 16777215, 0); - var25 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var25 - 73, var43 - 20); - var0.drawCentered("Back", var25, var43 + 5, 16777215, 0); - var43 = 356; - var1.drawCentered("Still having trouble logging in?", class78.loginBoxCenter, var43, 268435455, 0); - } else if (Login.loginIndex == 6) { - var33 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 321; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var33 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var33 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var4 = Login.loginBoxX + 180 - 80; - var23 = 321; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 9) { - var33 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 25; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 25; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); - var4 = Login.loginBoxX + 180; - var23 = 311; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 10) { - var34 = Login.loginBoxX + 180; - var35 = 209; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var35, 16776960, 0); - var4 = var35 + 20; - Login.field873.drawAt(var34 - 109, var4); - class4.field8.drawAt(var34 - 48, var4 + 18); - } else if (Login.loginIndex == 12) { - var34 = class78.loginBoxCenter; - var35 = 216; - var2.drawCentered("Before using this app, please read and accept our", var34, var35, 16777215, 0); - var4 = var35 + 17; - var2.drawCentered("terms of use, privacy policy, and end user licence", var34, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("agreement (EULA).", var34, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("By accepting, you agree to these documents.", var34, var4, 16777215, 0); - var34 = class78.loginBoxCenter - 80; - var35 = 311; - class132.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); - var0.drawCentered("Accept", var34, var35 + 5, 16777215, 0); - var34 = class78.loginBoxCenter + 80; - class132.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); - var0.drawCentered("Decline", var34, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 13) { - var33 = 231; - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 20; - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var34, 16777215, 0); - var4 = Login.loginBoxX + 180; - var33 = 311; - class132.titlebuttonSprite.drawAt(var4 - 73, var33 - 20); - var0.drawCentered("Back", var4, var33 + 5, 16777215, 0); - } else if (Login.loginIndex == 14) { - var33 = 201; - String var24 = ""; - var5 = ""; - var6 = ""; - switch(Login.field884) { - case 0: - var24 = "Your account has been disabled."; - var5 = Strings.field3540; - var6 = ""; - break; - case 1: - var24 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field3539; - var6 = ""; - break; - default: - class20.Login_promptCredentials(false); - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var33, 16776960, 0); - var34 = var33 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var2.drawCentered(var6, Login.loginBoxX + 180, var34, 16776960, 0); - var34 += 15; - var25 = Login.loginBoxX + 180; - var43 = 276; - class132.titlebuttonSprite.drawAt(var25 - 73, var43 - 20); - var0.drawCentered("Support Page", var25, var43 + 5, 16777215, 0); - var25 = Login.loginBoxX + 180; - var43 = 326; - class132.titlebuttonSprite.drawAt(var25 - 73, var43 - 20); - var0.drawCentered("Back", var25, var43 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var33 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); - var34 = var33 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); - var34 += 15; - var4 = Login.loginBoxX + 180; - var23 = 301; - class132.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var30 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var30); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, MouseRecorder.canvasHeight); - Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var30); - } - - class16.title_muteSprite[WorldMapDecorationType.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == ReflectionCheck.clientLanguage) { - if (Client.field563 != null) { - var34 = Login.xPadding + 5; - var35 = 463; - byte var41 = 100; - byte var31 = 35; - Client.field563.drawAt(var34, var35); - var0.drawCentered("World" + " " + Client.worldId, var41 / 2 + var34, var31 / 2 + var35 - 2, 16777215, 0); - if (class4.World_request != null) { - var1.drawCentered("Loading...", var41 / 2 + var34, var31 / 2 + var35 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var41 / 2 + var34, var31 / 2 + var35 + 12, 16777215, 0); - } - } else { - Client.field563 = class131.SpriteBuffer_getIndexedSpriteByName(class176.archive8, "sl_button", ""); + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11306 + Widget var3 = var1[var2]; // L: 11307 + if (var3 != null) { // L: 11308 + var3.modelFrame = 0; // L: 11309 + var3.modelFrameCycle = 0; // L: 11310 } } } - } + } // L: 11312 + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "55" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (AbstractArchive.friendsChat != null) { // L: 11804 + PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2766, Client.packetWriter.isaacCipher); // L: 11805 + var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 11806 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11807 + Client.packetWriter.addNode(var1); // L: 11808 + } + } // L: 11809 } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index 2a8e6e3f3e..de5e217cc5 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -4,476 +4,471 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("it") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("e") - public static short[] field3023; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("gi") - @ObfuscatedGetter( - intValue = -176425063 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "Lhy;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("equipment") int[] equipment; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -969164405 + intValue = -1446763331 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -1231560757100650169L + longValue = 3851484461593435505L ) @Export("hash") long hash; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -479237997467646527L + longValue = -8997402803958711599L ) long field3021; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Led;" + descriptor = "[Ley;" ) - class150[] field3018; - @ObfuscatedName("a") - boolean field3022; + class150[] field3027; + @ObfuscatedName("p") + boolean field3026; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27 } public PlayerComposition() { - this.field3022 = false; + this.field3026 = false; // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([I[Led;Z[IZII)V", - garbageValue = "1177494598" + descriptor = "([I[Ley;Z[IZII)V", + garbageValue = "-1612430375" ) - public void method4954(int[] var1, class150[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field3018 = var2; - this.field3022 = var3; - this.update(var1, var4, var5, var6); - } + public void method5062(int[] var1, class150[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3027 = var2; // L: 30 + this.field3026 = var3; // L: 31 + this.update(var1, var4, var5, var6); // L: 32 + } // L: 33 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "([I[IZII)V", - garbageValue = "-106025647" + garbageValue = "844245890" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { - var1 = new int[12]; + if (var1 == null) { // L: 36 + var1 = new int[12]; // L: 37 - for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = WorldMapLabelSize.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { - var1[equipmentIndices[var5]] = var6 + 256; - break; + for (int var5 = 0; var5 < 7; ++var5) { // L: 38 + for (int var6 = 0; var6 < class67.KitDefinition_fileCount; ++var6) { // L: 39 + KitDefinition var7 = ReflectionCheck.KitDefinition_get(var6); // L: 40 + if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { // L: 41 + var1[equipmentIndices[var5]] = var6 + 256; // L: 42 + break; // L: 43 } } } } - this.equipment = var1; - this.bodyColors = var2; - this.isFemale = var3; - this.npcTransformId = var4; - this.setHash(); - } + this.equipment = var1; // L: 48 + this.bodyColors = var2; // L: 49 + this.isFemale = var3; // L: 50 + this.npcTransformId = var4; // L: 51 + this.setHash(); // L: 52 + } // L: 53 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-566640321" + garbageValue = "1990205342" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { - if (var1 != 1 || !this.isFemale) { - int var3 = this.equipment[equipmentIndices[var1]]; - if (var3 != 0) { - var3 -= 256; + if (var1 != 1 || !this.isFemale) { // L: 56 + int var3 = this.equipment[equipmentIndices[var1]]; // L: 57 + if (var3 != 0) { // L: 58 + var3 -= 256; // L: 59 KitDefinition var4; do { - if (!var2) { - --var3; - if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; + if (!var2) { // L: 61 + --var3; // L: 62 + if (var3 < 0) { // L: 63 + var3 = class67.KitDefinition_fileCount - 1; } } else { - ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; + ++var3; // L: 66 + if (var3 >= class67.KitDefinition_fileCount) { + var3 = 0; // L: 67 } } - var4 = WorldMapLabelSize.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); + var4 = ReflectionCheck.KitDefinition_get(var3); // L: 69 + } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70 - this.equipment[equipmentIndices[var1]] = var3 + 256; - this.setHash(); + this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 + this.setHash(); // L: 73 } } - } + } // L: 74 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "497995662" + descriptor = "(IZB)V", + garbageValue = "-58" ) - public void method4953(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; + public void method5045(int var1, boolean var2) { + int var3 = this.bodyColors[var1]; // L: 77 boolean var4; - if (!var2) { + if (!var2) { // L: 78 do { - --var3; - if (var3 < 0) { - var3 = class185.field2101[var1].length - 1; + --var3; // L: 80 + if (var3 < 0) { // L: 81 + var3 = class137.field1519[var1].length - 1; // L: 82 } - if (var1 == 4 && var3 >= 8) { - var4 = false; + if (var1 == 4 && var3 >= 8) { // L: 86 + var4 = false; // L: 87 } else { - var4 = true; + var4 = true; // L: 90 } - } while(!var4); + } while(!var4); // L: 92 } else { do { - ++var3; - if (var3 >= class185.field2101[var1].length) { + ++var3; // L: 97 + if (var3 >= class137.field1519[var1].length) { // L: 98 var3 = 0; } - if (var1 == 4 && var3 >= 8) { - var4 = false; + if (var1 == 4 && var3 >= 8) { // L: 101 + var4 = false; // L: 102 } else { - var4 = true; + var4 = true; // L: 105 } - } while(!var4); + } while(!var4); // L: 107 } - this.bodyColors[var1] = var3; - this.setHash(); - } + this.bodyColors[var1] = var3; // L: 110 + this.setHash(); // L: 111 + } // L: 112 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-561469046" + garbageValue = "586785415" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { - this.update((int[])null, this.bodyColors, var1, -1); + if (this.isFemale != var1) { // L: 115 + this.update((int[])null, this.bodyColors, var1, -1); // L: 116 } - } + } // L: 117 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-941948910" + descriptor = "(Lop;I)V", + garbageValue = "462047294" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); + var1.writeByte(this.isFemale ? 1 : 0); // L: 120 int var2; - for (var2 = 0; var2 < 7; ++var2) { - int var3 = this.equipment[equipmentIndices[var2]]; - if (var3 == 0) { + for (var2 = 0; var2 < 7; ++var2) { // L: 121 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 122 + if (var3 == 0) { // L: 123 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); + var1.writeByte(var3 - 256); // L: 124 } } - for (var2 = 0; var2 < 5; ++var2) { + for (var2 = 0; var2 < 5; ++var2) { // L: 126 var1.writeByte(this.bodyColors[var2]); } - } + } // L: 127 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2100773488" + garbageValue = "-2147251395" ) @Export("setHash") void setHash() { - 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; + 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 int var5; - for (var5 = 0; var5 < 12; ++var5) { - this.hash <<= 4; - if (this.equipment[var5] >= 256) { + for (var5 = 0; var5 < 12; ++var5) { // L: 136 + this.hash <<= 4; // L: 137 + if (this.equipment[var5] >= 256) { // L: 138 this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { + if (this.equipment[0] >= 256) { // L: 140 this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { + if (this.equipment[1] >= 256) { // L: 141 this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { - this.hash <<= 3; - this.hash += (long)this.bodyColors[var5]; + for (var5 = 0; var5 < 5; ++var5) { // L: 142 + this.hash <<= 3; // L: 143 + this.hash += (long)this.bodyColors[var5]; // L: 144 } - 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.field3022) { + 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 (0L != var1 && this.hash != var1 || this.field3026) { // L: 150 PlayerAppearance_cachedModels.remove(var1); } - } + } // L: 151 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lfe;ILfe;II)Lhl;", - garbageValue = "-2102525225" + descriptor = "(Lfm;ILfm;II)Lhl;", + garbageValue = "-1279646486" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { - return class112.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + if (this.npcTransformId != -1) { // L: 154 + return ScriptFrame.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 } else { - long var5 = this.hash; - int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { - var7 = new int[12]; + 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 - for (int var8 = 0; var8 < 12; ++var8) { + for (int var8 = 0; var8 < 12; ++var8) { // L: 161 var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { - var5 += (long)(var1.shield - this.equipment[5] << 40); - var7[5] = var1.shield; + if (var1.shield >= 0) { // L: 162 + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163 + var7[5] = var1.shield; // L: 164 } - if (var1.weapon >= 0) { - var5 += (long)(var1.weapon - this.equipment[3] << 48); - var7[3] = var1.weapon; + if (var1.weapon >= 0) { // L: 166 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167 + var7[3] = var1.weapon; // L: 168 } } - Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); - if (var18 == null) { - boolean var9 = false; + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171 + if (var18 == null) { // L: 172 + boolean var9 = false; // L: 173 int var11; - for (int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !WorldMapLabelSize.KitDefinition_get(var11 - 256).ready()) { + for (int var10 = 0; var10 < 12; ++var10) { // L: 174 + var11 = var7[var10]; // L: 175 + if (var11 >= 256 && var11 < 512 && !ReflectionCheck.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 var9 = true; } - if (var11 >= 512 && !class87.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !TaskHandler.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 var9 = true; } } - if (var9) { - if (this.field3021 != -1L) { + if (var9) { // L: 183 + if (this.field3021 != -1L) { // L: 184 var18 = (Model)PlayerAppearance_cachedModels.get(this.field3021); } - if (var18 == null) { + if (var18 == null) { // L: 185 return null; } } - if (var18 == null) { - ModelData[] var19 = new ModelData[12]; - var11 = 0; + if (var18 == null) { // L: 187 + ModelData[] var19 = new ModelData[12]; // L: 188 + var11 = 0; // L: 189 int var13; - for (int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; - if (var13 >= 256 && var13 < 512) { - ModelData var14 = WorldMapLabelSize.KitDefinition_get(var13 - 256).getModelData(); - if (var14 != null) { + for (int var12 = 0; var12 < 12; ++var12) { // L: 190 + var13 = var7[var12]; // L: 191 + if (var13 >= 256 && var13 < 512) { // L: 192 + ModelData var14 = ReflectionCheck.KitDefinition_get(var13 - 256).getModelData(); // L: 193 + if (var14 != null) { // L: 194 var19[var11++] = var14; } } - if (var13 >= 512) { - ItemComposition var22 = class87.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method3290(this.isFemale); - if (var15 != null) { - if (this.field3018 != null) { - class150 var16 = this.field3018[var12]; - if (var16 != null) { + if (var13 >= 512) { // L: 196 + ItemComposition var22 = TaskHandler.ItemDefinition_get(var13 - 512); // L: 197 + ModelData var15 = var22.method3397(this.isFemale); // L: 198 + if (var15 != null) { // L: 199 + if (this.field3027 != null) { // L: 200 + class150 var16 = this.field3027[var12]; // L: 201 + if (var16 != null) { // L: 202 int var17; - if (var16.field1606 != null && var22.recolorFrom != null && var16.field1606.length == var22.recolorTo.length) { - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { - var15.recolor(var22.recolorTo[var17], var16.field1606[var17]); + if (var16.field1598 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1598.length) { // L: 203 + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204 + var15.recolor(var22.recolorTo[var17], var16.field1598[var17]); // L: 205 } } - if (var16.field1607 != null && var22.retextureFrom != null && var16.field1607.length == var22.retextureTo.length) { - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { - var15.retexture(var22.retextureTo[var17], var16.field1607[var17]); + if (var16.field1600 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1600.length) { // L: 208 + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209 + var15.retexture(var22.retextureTo[var17], var16.field1600[var17]); // L: 210 } } } } - var19[var11++] = var15; + var19[var11++] = var15; // L: 215 } } } - ModelData var20 = new ModelData(var19, var11); + ModelData var20 = new ModelData(var19, var11); // L: 219 - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class185.field2101[var13].length) { - var20.recolor(field3023[var13], class185.field2101[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 220 + if (this.bodyColors[var13] < class137.field1519[var13].length) { // L: 221 + var20.recolor(DesktopPlatformInfoProvider.field4081[var13], class137.field1519[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < WorldMapLabel.field2180[var13].length) { - var20.recolor(SceneTilePaint.field2600[var13], WorldMapLabel.field2180[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < ClanChannel.field1512[var13].length) { // L: 222 + var20.recolor(Varps.field3013[var13], ClanChannel.field1512[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var18, var5); - this.field3021 = var5; + var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224 + PlayerAppearance_cachedModels.put(var18, var5); // L: 225 + this.field3021 = var5; // L: 226 } } - if (var1 == null && var3 == null) { + if (var1 == null && var3 == null) { // L: 230 return var18; } else { Model var21; - if (var1 != null && var3 != null) { + if (var1 != null && var3 != null) { // L: 231 var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { + } else if (var1 != null) { // L: 232 var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); + var21 = var3.transformActorModel(var18, var4); // L: 233 } - return var21; + return var21; // L: 234 } } } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Lgi;", - garbageValue = "305930830" + descriptor = "(I)Lgk;", + garbageValue = "1238658700" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { - return class112.getNpcDefinition(this.npcTransformId).getModelData(); + if (this.npcTransformId != -1) { // L: 238 + return ScriptFrame.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239 } else { - boolean var1 = false; + boolean var1 = false; // L: 241 int var3; - for (int var2 = 0; var2 < 12; ++var2) { - var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !WorldMapLabelSize.KitDefinition_get(var3 - 256).method2939()) { + for (int var2 = 0; var2 < 12; ++var2) { // L: 242 + var3 = this.equipment[var2]; // L: 243 + if (var3 >= 256 && var3 < 512 && !ReflectionCheck.KitDefinition_get(var3 - 256).method3053()) { // L: 244 245 var1 = true; } - if (var3 >= 512 && !class87.ItemDefinition_get(var3 - 512).method3266(this.isFemale)) { + if (var3 >= 512 && !TaskHandler.ItemDefinition_get(var3 - 512).method3342(this.isFemale)) { // L: 247 248 var1 = true; } } - if (var1) { + if (var1) { // L: 251 return null; } else { - ModelData[] var7 = new ModelData[12]; - var3 = 0; + ModelData[] var7 = new ModelData[12]; // L: 252 + var3 = 0; // L: 253 int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; + for (int var4 = 0; var4 < 12; ++var4) { // L: 254 + var5 = this.equipment[var4]; // L: 255 ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = WorldMapLabelSize.KitDefinition_get(var5 - 256).getKitDefinitionModels(); - if (var6 != null) { + if (var5 >= 256 && var5 < 512) { // L: 256 + var6 = ReflectionCheck.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257 + if (var6 != null) { // L: 258 var7[var3++] = var6; } } - if (var5 >= 512) { - var6 = class87.ItemDefinition_get(var5 - 512).method3267(this.isFemale); - if (var6 != null) { + if (var5 >= 512) { // L: 260 + var6 = TaskHandler.ItemDefinition_get(var5 - 512).method3409(this.isFemale); // L: 261 + if (var6 != null) { // L: 262 var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); + ModelData var8 = new ModelData(var7, var3); // L: 265 - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class185.field2101[var5].length) { - var8.recolor(field3023[var5], class185.field2101[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 266 + if (this.bodyColors[var5] < class137.field1519[var5].length) { // L: 267 + var8.recolor(DesktopPlatformInfoProvider.field4081[var5], class137.field1519[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < WorldMapLabel.field2180[var5].length) { - var8.recolor(SceneTilePaint.field2600[var5], WorldMapLabel.field2180[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < ClanChannel.field1512[var5].length) { // L: 268 + var8.recolor(Varps.field3013[var5], ClanChannel.field1512[var5][this.bodyColors[var5]]); } } - return var8; + return var8; // L: 270 } } } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "57" + descriptor = "(I)I", + garbageValue = "-704245622" ) @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 + class112.getNpcDefinition(this.npcTransformId).id; + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + ScriptFrame.getNpcDefinition(this.npcTransformId).id; // L: 274 275 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "86" + ) + public static boolean method5067(int var0) { + return (var0 >> 20 & 1) != 0; // L: 17 } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index c9f51bdd69..420f2167ae 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,140 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jd") +@ObfuscatedName("jb") @Implements("PlayerType") public enum PlayerType implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - field3657(6, 22, false, false, true), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - field3658(7, 41, false, false, true), @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljb;" ) - field3654(8, 42, false, false, true); - - @ObfuscatedName("mw") + field3652(6, 22, false, false, true), + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljb;" ) - static Widget field3661; - @ObfuscatedName("i") + field3649(7, 41, false, false, true), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3650(8, 42, false, false, true); + + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1199460545 + intValue = -1222118175 ) @Export("id") final int id; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 84538647 + intValue = 279346655 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { - this.id = var3; - this.modIcon = var4; - this.isPrivileged = var6; - this.isUser = var7; - } + this.id = var3; // L: 26 + this.modIcon = var4; // L: 27 + this.isPrivileged = var6; // L: 28 + this.isUser = var7; // L: 29 + } // L: 30 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 33 } - @ObfuscatedName("aa") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "74" + descriptor = "(IIB)V", + garbageValue = "0" ) - static int method5153(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } + @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 - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; + 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 } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + ObjectSound.sortWorlds(WorldMapEvent.World_worlds, 0, WorldMapEvent.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "268701760" + ) + public static boolean method5239(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 224 225 } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index ed8feb8fe6..eff48cd654 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,92 +4,151 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cc") @Implements("Players") public class Players { - @ObfuscatedName("f") - static byte[] field1247; - @ObfuscatedName("j") - static byte[] field1245; - @ObfuscatedName("m") + @ObfuscatedName("s") + static byte[] field1244; + @ObfuscatedName("a") + static byte[] field1241; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lot;" + descriptor = "[Lop;" ) - static Buffer[] field1248; - @ObfuscatedName("k") + static Buffer[] field1242; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -929860441 + intValue = -1178638681 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1961381127 + intValue = 1076680873 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1631297959 + intValue = -1904641985 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lop;" ) - static Buffer field1259; + static Buffer field1240; + @ObfuscatedName("do") + static boolean field1254; static { - field1247 = new byte[2048]; - field1245 = new byte[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]; - field1259 = new Buffer(new byte[5000]); + field1244 = new byte[2048]; + field1241 = new byte[2048]; + field1242 = new Buffer[2048]; + 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 + Players_orientations = new int[2048]; // L: 26 + Players_targetIndices = new int[2048]; // L: 27 + Players_pendingUpdateCount = 0; // L: 28 + Players_pendingUpdateIndices = new int[2048]; // L: 29 + field1240 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1246868543" + descriptor = "(Lko;I)V", + garbageValue = "-678131121" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); + public static void method2327(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(Lcq;ZI)V", + garbageValue = "-1700143526" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11555 + int var3 = (int)var0.key; // L: 11556 + var0.remove(); // L: 11557 + int var5; + if (var1 && var2 != -1 && class132.Widget_loadedInterfaces[var2]) { // L: 11558 11559 11560 + class283.Widget_archive.clearFilesGroup(var2); // L: 11561 + if (WorldMapSection1.Widget_interfaceComponents[var2] != null) { // L: 11562 + boolean var4 = true; // L: 11563 + + for (var5 = 0; var5 < WorldMapSection1.Widget_interfaceComponents[var2].length; ++var5) { // L: 11564 + if (WorldMapSection1.Widget_interfaceComponents[var2][var5] != null) { // L: 11565 + if (WorldMapSection1.Widget_interfaceComponents[var2][var5].type != 2) { // L: 11566 + WorldMapSection1.Widget_interfaceComponents[var2][var5] = null; + } else { + var4 = false; // L: 11567 + } + } + } + + if (var4) { // L: 11570 + WorldMapSection1.Widget_interfaceComponents[var2] = null; + } + + class132.Widget_loadedInterfaces[var2] = false; // L: 11571 + } } - 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; - } + class316.method5839(var2); // L: 11573 + Widget var7 = UserComparator9.getWidget(var3); // L: 11574 + if (var7 != null) { // L: 11575 + class184.invalidateWidget(var7); + } + + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11577 + if (class122.method2607(Client.menuOpcodes[var5])) { // L: 11578 + if (var5 < Client.menuOptionsCount - 1) { // L: 11579 + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11580 + Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11581 + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11582 + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11583 + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11584 + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11585 + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11586 + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11587 + } + } + + --var5; // L: 11590 + --Client.menuOptionsCount; // L: 11591 + } + } + + class262.method5136(); // L: 11594 + if (Client.rootInterface != -1) { // L: 11596 + ItemComposition.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11597 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index d241d40f83..9790325657 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pa") +@ObfuscatedName("pz") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpz;" ) - static final PrivateChatMode field4412; - @ObfuscatedName("q") + static final PrivateChatMode field4422; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpz;" ) - public static final PrivateChatMode field4411; - @ObfuscatedName("f") + public static final PrivateChatMode field4425; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpz;" ) - static final PrivateChatMode field4413; - @ObfuscatedName("j") + static final PrivateChatMode field4423; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1139302799 + intValue = -215884787 ) - public final int field4414; + public final int field4424; static { - field4412 = new PrivateChatMode(0); - field4411 = new PrivateChatMode(1); - field4413 = new PrivateChatMode(2); - } + field4422 = new PrivateChatMode(0); // L: 5 + field4425 = new PrivateChatMode(1); // L: 6 + field4423 = new PrivateChatMode(2); + } // L: 7 PrivateChatMode(int var1) { - this.field4414 = var1; - } + this.field4424 = var1; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 6816bed599..0fd049b7e9 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,242 +4,942 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bi") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("kp") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Lmp;" ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("l") + static AbstractSocket field915; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 612017877 + intValue = -2098760211 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1252527971 + intValue = -391632779 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -861559657 + intValue = 764309531 ) @Export("sourceX") int sourceX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -178242535 + intValue = -586694521 ) @Export("sourceY") int sourceY; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1274361179 + intValue = -1961022753 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 632360777 + intValue = -787475925 ) @Export("endHeight") int endHeight; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1209560849 + intValue = 196209817 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1759593837 + intValue = 321994179 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -212620571 + intValue = 178012727 ) @Export("slope") int slope; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1789569559 + intValue = -736390091 ) @Export("startHeight") int startHeight; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1450017667 + intValue = 1511364615 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("isMoving") boolean isMoving; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("x") double x; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("y") double y; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("z") double z; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("speedX") double speedX; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("speedY") double speedY; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("speed") double speed; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("speedZ") double speedZ; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1966340063 + intValue = -1310821215 ) @Export("yaw") int yaw; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -618468267 + intValue = 1676153713 ) @Export("pitch") int pitch; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfe;" + descriptor = "Lfm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 999044951 + intValue = -1216775707 ) @Export("frame") int frame; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -987354937 + intValue = 1200268787 ) @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - this.isMoving = false; - this.frame = 0; - this.frameCycle = 0; - this.id = var1; - this.plane = var2; - this.sourceX = var3; - this.sourceY = var4; - this.sourceZ = var5; - this.cycleStart = var6; - this.cycleEnd = var7; - this.slope = var8; - this.startHeight = var9; - this.targetIndex = var10; - this.endHeight = var11; - this.isMoving = false; - int var12 = class21.SpotAnimationDefinition_get(this.id).sequence; - if (var12 != -1) { - this.sequenceDefinition = KitDefinition.SequenceDefinition_get(var12); + this.isMoving = false; // L: 20 + this.frame = 0; // L: 32 + this.frameCycle = 0; // L: 33 + this.id = var1; // L: 36 + this.plane = var2; // L: 37 + this.sourceX = var3; // L: 38 + this.sourceY = var4; // L: 39 + this.sourceZ = var5; // L: 40 + 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 = BZip2State.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + if (var12 != -1) { // L: 49 + this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 50 } - } + } // L: 51 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-631217793" + garbageValue = "2083342033" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var7 * var7 + var5 * var5); - this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; - this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; - this.z = (double)this.sourceZ; + if (!this.isMoving) { // L: 54 + var5 = (double)(var1 - this.sourceX); // L: 55 + double var7 = (double)(var2 - this.sourceY); // L: 56 + double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 + this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; // L: 58 + this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; // L: 59 + this.z = (double)this.sourceZ; // L: 60 } - var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); - if (!this.isMoving) { + var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 + this.speedX = ((double)var1 - this.x) / var5; // L: 63 + 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.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); - } + this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); // L: 67 + } // L: 68 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class21.SpotAnimationDefinition_get(this.id); - Model var2 = var1.getModel(this.frame); - if (var2 == null) { + SpotAnimationDefinition var1 = BZip2State.SpotAnimationDefinition_get(this.id); // L: 92 + Model var2 = var1.getModel(this.frame); // L: 93 + if (var2 == null) { // L: 94 return null; } else { - var2.rotateZ(this.pitch); - return var2; + var2.rotateZ(this.pitch); // L: 95 + return var2; // L: 96 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-39" + descriptor = "(II)V", + garbageValue = "1939244665" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; - this.x += (double)var1 * this.speedX; - this.y += (double)var1 * this.speedY; - 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) { - this.frameCycle += var1; + this.isMoving = true; // L: 71 + this.x += this.speedX * (double)var1; // L: 72 + this.y += (double)var1 * this.speedY; // L: 73 + this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; // L: 74 + this.speedZ += this.accelerationZ * (double)var1; // L: 75 + this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 + this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 + if (this.sequenceDefinition != null) { // L: 78 + this.frameCycle += var1; // L: 79 while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { - return; + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 80 + return; // L: 89 } - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - } while(this.frame < this.sequenceDefinition.frameIds.length); + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 81 + ++this.frame; // L: 82 + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 83 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 84 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 85 this.frame = 0; } } } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Loj;II)V", + garbageValue = "1062614166" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 360 + if (var2) { // L: 361 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); // L: 362 + Player var4 = Client.players[var1]; // L: 363 + if (var3 == 0) { // L: 364 + if (var2) { // L: 365 + var4.field1067 = false; // L: 366 + } else if (Client.localPlayerIndex == var1) { // L: 369 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class19.baseX + var4.pathX[0] >> 13 << 14) + (DefaultsGroup.baseY + var4.pathY[0] >> 13); // L: 370 + if (var4.field1112 != -1) { // L: 371 + Players.Players_orientations[var1] = var4.field1112; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 372 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 373 + Client.players[var1] = null; // L: 374 + if (var0.readBits(1) != 0) { // L: 375 + WorldMapData_0.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 378 + var5 = var0.readBits(3); // L: 379 + var6 = var4.pathX[0]; // L: 380 + var7 = var4.pathY[0]; // L: 381 + if (var5 == 0) { // L: 382 + --var6; // L: 383 + --var7; // L: 384 + } else if (var5 == 1) { // L: 386 + --var7; + } else if (var5 == 2) { // L: 387 + ++var6; // L: 388 + --var7; // L: 389 + } else if (var5 == 3) { // L: 391 + --var6; + } else if (var5 == 4) { // L: 392 + ++var6; + } else if (var5 == 5) { // L: 393 + --var6; // L: 394 + ++var7; // L: 395 + } else if (var5 == 6) { // L: 397 + ++var7; + } else if (var5 == 7) { // L: 398 + ++var6; // L: 399 + ++var7; // L: 400 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 402 + var4.resetPath(var6, var7); // L: 403 + var4.field1067 = false; // L: 404 + } else if (var2) { // L: 406 + var4.field1067 = true; // L: 407 + var4.tileX = var6; // L: 408 + var4.tileY = var7; // L: 409 + } else { + var4.field1067 = false; // L: 412 + var4.method2109(var6, var7, Players.field1241[var1]); // L: 413 + } + + } else if (var3 == 2) { // L: 417 + var5 = var0.readBits(4); // L: 418 + var6 = var4.pathX[0]; // L: 419 + var7 = var4.pathY[0]; // L: 420 + if (var5 == 0) { // L: 421 + var6 -= 2; // L: 422 + var7 -= 2; // L: 423 + } else if (var5 == 1) { // L: 425 + --var6; // L: 426 + var7 -= 2; // L: 427 + } else if (var5 == 2) { // L: 429 + var7 -= 2; + } else if (var5 == 3) { // L: 430 + ++var6; // L: 431 + var7 -= 2; // L: 432 + } else if (var5 == 4) { // L: 434 + var6 += 2; // L: 435 + var7 -= 2; // L: 436 + } else if (var5 == 5) { // L: 438 + var6 -= 2; // L: 439 + --var7; // L: 440 + } else if (var5 == 6) { // L: 442 + var6 += 2; // L: 443 + --var7; // L: 444 + } else if (var5 == 7) { // L: 446 + var6 -= 2; + } else if (var5 == 8) { // L: 447 + var6 += 2; + } else if (var5 == 9) { // L: 448 + var6 -= 2; // L: 449 + ++var7; // L: 450 + } else if (var5 == 10) { // L: 452 + var6 += 2; // L: 453 + ++var7; // L: 454 + } else if (var5 == 11) { // L: 456 + var6 -= 2; // L: 457 + var7 += 2; // L: 458 + } else if (var5 == 12) { // L: 460 + --var6; // L: 461 + var7 += 2; // L: 462 + } else if (var5 == 13) { // L: 464 + var7 += 2; + } else if (var5 == 14) { // L: 465 + ++var6; // L: 466 + var7 += 2; // L: 467 + } else if (var5 == 15) { // L: 469 + var6 += 2; // L: 470 + var7 += 2; // L: 471 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 473 + var4.resetPath(var6, var7); // L: 474 + var4.field1067 = false; // L: 475 + } else if (var2) { // L: 477 + var4.field1067 = true; // L: 478 + var4.tileX = var6; // L: 479 + var4.tileY = var7; // L: 480 + } else { + var4.field1067 = false; // L: 483 + var4.method2109(var6, var7, Players.field1241[var1]); // L: 484 + } + + } else { + var5 = var0.readBits(1); // L: 488 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 489 + var6 = var0.readBits(12); // L: 490 + var7 = var6 >> 10; // L: 491 + var8 = var6 >> 5 & 31; // L: 492 + if (var8 > 15) { // L: 493 + var8 -= 32; + } + + var9 = var6 & 31; // L: 494 + if (var9 > 15) { // L: 495 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 496 + var11 = var9 + var4.pathY[0]; // L: 497 + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 498 + if (var2) { // L: 502 + var4.field1067 = true; // L: 503 + var4.tileX = var10; // L: 504 + var4.tileY = var11; // L: 505 + } else { + var4.field1067 = false; // L: 508 + var4.method2109(var10, var11, Players.field1241[var1]); // L: 509 + } + } else { + var4.resetPath(var10, var11); // L: 499 + var4.field1067 = false; // L: 500 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 511 + if (Client.localPlayerIndex == var1) { // L: 512 + GrandExchangeOfferTotalQuantityComparator.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 515 + var7 = var6 >> 28; // L: 516 + var8 = var6 >> 14 & 16383; // L: 517 + var9 = var6 & 16383; // L: 518 + var10 = (var8 + class19.baseX + var4.pathX[0] & 16383) - class19.baseX; // L: 519 + var11 = (var9 + DefaultsGroup.baseY + var4.pathY[0] & 16383) - DefaultsGroup.baseY; // L: 520 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 521 + var4.resetPath(var10, var11); // L: 522 + var4.field1067 = false; // L: 523 + } else if (var2) { // L: 525 + var4.field1067 = true; // L: 526 + var4.tileX = var10; // L: 527 + var4.tileY = var11; // L: 528 + } else { + var4.field1067 = false; // L: 531 + var4.method2109(var10, var11, Players.field1241[var1]); // L: 532 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 534 + if (Client.localPlayerIndex == var1) { // L: 535 + GrandExchangeOfferTotalQuantityComparator.Client_plane = var4.plane; + } + + } + } + } + } // L: 367 376 415 486 513 536 + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1509830378" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4666 + if (HealthBarDefinition.localPlayer.x >> 7 == Client.destinationX && HealthBarDefinition.localPlayer.y >> 7 == Client.destinationY) { // L: 4668 + Client.destinationX = 0; // L: 4669 + } + + VerticalAlignment.method3157(); // L: 4672 + VertexNormal.method4623(); // L: 4673 + ClanSettings.addNpcsToScene(true); // L: 4674 + BuddyRankComparator.method2500(); // L: 4675 + ClanSettings.addNpcsToScene(false); // L: 4676 + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4678 4679 4696 + if (var4.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4680 + if (Client.cycle >= var4.cycleStart) { // L: 4681 + if (var4.targetIndex > 0) { // L: 4682 + NPC var31 = Client.npcs[var4.targetIndex - 1]; // L: 4683 + if (var31 != null && var31.x >= 0 && var31.x < 13312 && var31.y >= 0 && var31.y < 13312) { // L: 4684 + var4.setDestination(var31.x, var31.y, class392.getTileHeight(var31.x, var31.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { // L: 4686 + var6 = -var4.targetIndex - 1; // L: 4688 + Player var34; + if (var6 == Client.localPlayerIndex) { // L: 4689 + var34 = HealthBarDefinition.localPlayer; + } else { + var34 = Client.players[var6]; // L: 4690 + } + + if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 4691 + var4.setDestination(var34.x, var34.y, class392.getTileHeight(var34.x, var34.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field531); // L: 4693 + GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4694 + } + } else { + var4.remove(); + } + } + + VarpDefinition.method3004(); // L: 4699 + SpriteMask.setViewportShape(var0, var1, var2, var3, true); // L: 4700 + var0 = Client.viewportOffsetX; // L: 4701 + var1 = Client.viewportOffsetY; // L: 4702 + var2 = Client.viewportWidth; // L: 4703 + var3 = Client.viewportHeight; // L: 4704 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4705 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4706 + int var5; + int var7; + int var8; + int var11; + int var28; + if (!Client.isCameraLocked) { // L: 4707 + var28 = Client.camAngleX; // L: 4708 + if (Client.field556 / 256 > var28) { // L: 4709 + var28 = Client.field556 / 256; + } + + if (Client.field718[4] && Client.field598[4] + 128 > var28) { // L: 4710 + var28 = Client.field598[4] + 128; + } + + var5 = Client.camAngleY & 2047; // L: 4711 + var6 = class320.oculusOrbFocalPointX; // L: 4712 + var7 = DynamicObject.field942; // L: 4713 + var8 = class18.oculusOrbFocalPointY; // L: 4714 + var11 = var28 * 3 + 600; // L: 4719 + method1957(var6, var7, var8, var28, var5, var11, var3); // L: 4721 + } + + int var9; + int var10; + int var12; + int var14; + if (!Client.isCameraLocked) { // L: 4724 + if (class408.clientPreferences.roofsHidden) { // L: 4727 + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4728 + } else { + label596: { + var6 = 3; // L: 4731 + if (class121.cameraPitch < 310) { // L: 4732 + if (Client.oculusOrbState == 1) { // L: 4735 + var7 = class320.oculusOrbFocalPointX >> 7; // L: 4736 + var8 = class18.oculusOrbFocalPointY >> 7; // L: 4737 + } else { + var7 = HealthBarDefinition.localPlayer.x >> 7; // L: 4740 + var8 = HealthBarDefinition.localPlayer.y >> 7; // L: 4741 + } + + var9 = WorldMapSectionType.cameraX >> 7; // L: 4743 + var10 = class65.cameraZ >> 7; // L: 4744 + if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { // L: 4745 + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4746 + break label596; // L: 4747 + } + + if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { // L: 4749 + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4750 + break label596; // L: 4751 + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4753 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + + if (var7 > var9) { // L: 4755 + var11 = var7 - var9; + } else { + var11 = var9 - var7; // L: 4756 + } + + if (var8 > var10) { // L: 4758 + var12 = var8 - var10; + } else { + var12 = var10 - var8; // L: 4759 + } + + int var13; + if (var11 > var12) { // L: 4760 + var13 = var12 * 65536 / var11; // L: 4761 + var14 = 32768; // L: 4762 + + while (var9 != var7) { // L: 4763 + if (var9 < var7) { // L: 4764 + ++var9; + } else if (var9 > var7) { // L: 4765 + --var9; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4766 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + + var14 += var13; // L: 4767 + if (var14 >= 65536) { // L: 4768 + var14 -= 65536; // L: 4769 + if (var10 < var8) { // L: 4770 + ++var10; + } else if (var10 > var8) { // L: 4771 + --var10; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4772 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + } + } + } else if (var12 > 0) { // L: 4776 + var13 = var11 * 65536 / var12; // L: 4777 + var14 = 32768; // L: 4778 + + while (var8 != var10) { // L: 4779 + if (var10 < var8) { // L: 4780 + ++var10; + } else if (var10 > var8) { // L: 4781 + --var10; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4782 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + + var14 += var13; // L: 4783 + if (var14 >= 65536) { // L: 4784 + var14 -= 65536; // L: 4785 + if (var9 < var7) { // L: 4786 + ++var9; + } else if (var9 > var7) { // L: 4787 + --var9; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4788 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + } + } + } + } + + if (HealthBarDefinition.localPlayer.x >= 0 && HealthBarDefinition.localPlayer.y >= 0 && HealthBarDefinition.localPlayer.x < 13312 && HealthBarDefinition.localPlayer.y < 13312) { // L: 4793 + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][HealthBarDefinition.localPlayer.x >> 7][HealthBarDefinition.localPlayer.y >> 7] & 4) != 0) { // L: 4797 + var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane; + } + + var5 = var6; // L: 4798 + } else { + var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4794 + } + } + } + + var28 = var5; // L: 4800 + } else { + var28 = class28.method404(); // L: 4802 + } + + var5 = WorldMapSectionType.cameraX; // L: 4803 + var6 = class174.cameraY; // L: 4804 + var7 = class65.cameraZ; // L: 4805 + var8 = class121.cameraPitch; // L: 4806 + var9 = WorldMapRegion.cameraYaw; // L: 4807 + + for (var10 = 0; var10 < 5; ++var10) { // L: 4808 + if (Client.field718[var10]) { // L: 4809 + var11 = (int)(Math.random() * (double)(Client.field719[var10] * 2 + 1) - (double)Client.field719[var10] + Math.sin((double)Client.field721[var10] / 100.0D * (double)Client.field722[var10]) * (double)Client.field598[var10]); // L: 4810 + if (var10 == 0) { // L: 4811 + WorldMapSectionType.cameraX += var11; + } + + if (var10 == 1) { // L: 4812 + class174.cameraY += var11; + } + + if (var10 == 2) { // L: 4813 + class65.cameraZ += var11; + } + + if (var10 == 3) { // L: 4814 + WorldMapRegion.cameraYaw = var11 + WorldMapRegion.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 4815 + class121.cameraPitch += var11; // L: 4816 + if (class121.cameraPitch < 128) { // L: 4817 + class121.cameraPitch = 128; + } + + if (class121.cameraPitch > 383) { // L: 4818 + class121.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; // L: 4822 + var11 = MouseHandler.MouseHandler_y; // L: 4823 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4824 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4825 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4826 + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4828 + class185.method3872(var10 - var0, var11 - var1); // L: 4829 + } else { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 4833 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4834 + } + + class14.playPcmPlayers(); // L: 4837 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4838 + class14.playPcmPlayers(); // L: 4839 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4840 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4841 + GameBuild.scene.draw(WorldMapSectionType.cameraX, class174.cameraY, class65.cameraZ, class121.cameraPitch, WorldMapRegion.cameraYaw, var28); // L: 4842 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4843 + class14.playPcmPlayers(); // L: 4844 + GameBuild.scene.clearTempGameObjects(); // L: 4845 + Client.overheadTextCount = 0; // L: 4847 + boolean var32 = false; // L: 4848 + var14 = -1; // L: 4849 + int var15 = -1; // L: 4850 + int var16 = Players.Players_count; // L: 4851 + int[] var17 = Players.Players_indices; // L: 4852 + + int var18; + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { // L: 4853 + Object var30; + if (var18 < var16) { // L: 4855 + var30 = Client.players[var17[var18]]; // L: 4856 + if (var17[var18] == Client.combatTargetPlayerIndex) { // L: 4857 + var32 = true; // L: 4858 + var14 = var18; // L: 4859 + continue; + } + + if (var30 == HealthBarDefinition.localPlayer) { // L: 4862 + var15 = var18; // L: 4863 + continue; // L: 4864 + } + } else { + var30 = Client.npcs[Client.npcIndices[var18 - var16]]; // L: 4867 + } + + LoginType.drawActor2d((Actor)var30, var18, var0, var1, var2, var3); // L: 4868 + } + + if (Client.renderSelf && var15 != -1) { // L: 4870 + LoginType.drawActor2d(HealthBarDefinition.localPlayer, var15, var0, var1, var2, var3); // L: 4871 + } + + if (var32) { // L: 4873 + LoginType.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); // L: 4874 + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { // L: 4876 + int var19 = Client.overheadTextXs[var18]; // L: 4877 + int var20 = Client.overheadTextYs[var18]; // L: 4878 + int var21 = Client.overheadTextXOffsets[var18]; // L: 4879 + int var22 = Client.overheadTextAscents[var18]; // L: 4880 + boolean var23 = true; // L: 4881 + + while (var23) { + var23 = false; // L: 4883 + + for (int var29 = 0; var29 < var18; ++var29) { // L: 4884 + if (var20 + 2 > Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] && var20 - var22 < Client.overheadTextYs[var29] + 2 && var19 - var21 < Client.overheadTextXOffsets[var29] + Client.overheadTextXs[var29] && var21 + var19 > Client.overheadTextXs[var29] - Client.overheadTextXOffsets[var29] && Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] < var20) { // L: 4885 4886 + var20 = Client.overheadTextYs[var29] - Client.overheadTextAscents[var29]; // L: 4887 + var23 = true; // L: 4888 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; // L: 4893 + Client.viewportTempY = Client.overheadTextYs[var18] = var20; // L: 4894 + String var24 = Client.overheadText[var18]; // L: 4895 + if (Client.chatEffects == 0) { // L: 4896 + int var25 = 16776960; // L: 4897 + if (Client.overheadTextColors[var18] < 6) { // L: 4898 + var25 = Client.field689[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { // L: 4899 + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { // L: 4900 + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { // L: 4901 + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { // L: 4902 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4903 + if (var26 < 50) { // L: 4904 + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { // L: 4905 + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { // L: 4906 + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { // L: 4908 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4909 + if (var26 < 50) { // L: 4910 + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { // L: 4911 + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { // L: 4912 + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { // L: 4914 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4915 + if (var26 < 50) { // L: 4916 + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { // L: 4917 + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { // L: 4918 + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { // L: 4920 + Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { // L: 4921 + Login.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { // L: 4922 + Login.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { // L: 4923 + Login.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { // L: 4924 + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (Login.fontBold12.stringWidth(var24) + 100) / 150; // L: 4925 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4926 + Login.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); // L: 4927 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4928 + } + + if (Client.overheadTextEffects[var18] == 5) { // L: 4930 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4931 + int var27 = 0; // L: 4932 + if (var26 < 25) { // L: 4933 + var27 = var26 - 25; + } else if (var26 > 125) { // L: 4934 + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Login.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4935 + Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); // L: 4936 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4937 + } + } else { + Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4941 + } + } + + if (Client.hintArrowType == 2) { // L: 4946 + DefaultsGroup.worldToScreen((Client.hintArrowX - class19.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - DefaultsGroup.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4947 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4948 + DevicePcmPlayerProvider.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field531); // L: 4950 + class393.method6885(var0, var1, var2, var3); // L: 4951 + WorldMapSectionType.cameraX = var5; // L: 4952 + class174.cameraY = var6; // L: 4953 + class65.cameraZ = var7; // L: 4954 + class121.cameraPitch = var8; // L: 4955 + WorldMapRegion.cameraYaw = var9; // L: 4956 + if (Client.isLoading) { // L: 4957 + byte var33 = 0; // L: 4960 + var14 = var33 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4961 + if (var14 == 0) { // L: 4965 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4967 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4968 + class91.drawLoadingMessage("Loading - please wait.", false); // L: 4969 + } + + } // L: 4971 + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "2132181355" + ) + static final void method1957(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + var5 = class150.method2971(var5, var6); // L: 5664 + int var7 = 2048 - var3 & 2047; // L: 5665 + int var8 = 2048 - var4 & 2047; // L: 5666 + int var9 = 0; // L: 5667 + int var10 = 0; // L: 5668 + int var11 = var5; // L: 5669 + int var12; + int var13; + int var14; + if (var7 != 0) { // L: 5670 + var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 5671 + var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 5672 + var14 = var13 * var10 - var12 * var5 >> 16; // L: 5673 + var11 = var12 * var10 + var5 * var13 >> 16; // L: 5674 + var10 = var14; // L: 5675 + } + + if (var8 != 0) { // L: 5677 + var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5678 + var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5679 + var14 = var9 * var13 + var12 * var11 >> 16; // L: 5680 + var11 = var13 * var11 - var12 * var9 >> 16; // L: 5681 + var9 = var14; // L: 5682 + } + + WorldMapSectionType.cameraX = var0 - var9; // L: 5684 + class174.cameraY = var1 - var10; // L: 5685 + class65.cameraZ = var2 - var11; // L: 5686 + class121.cameraPitch = var3; // L: 5687 + WorldMapRegion.cameraYaw = var4; // L: 5688 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class320.oculusOrbFocalPointX >> 7 != HealthBarDefinition.localPlayer.x >> 7 || class18.oculusOrbFocalPointY >> 7 != HealthBarDefinition.localPlayer.y >> 7)) { // L: 5689 5690 + var12 = HealthBarDefinition.localPlayer.plane; // L: 5691 + var13 = (class320.oculusOrbFocalPointX >> 7) + class19.baseX; // L: 5692 + var14 = (class18.oculusOrbFocalPointY >> 7) + DefaultsGroup.baseY; // L: 5693 + InvDefinition.method2986(var13, var14, var12, true); // L: 5694 + } + + } // L: 5697 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 39b9a23684..5ebba57f0a 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,88 +14,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("am") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("component") Component component; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("image") Image image; RasterProvider(int var1, int var2, Component var3) { - 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(); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-212105390" + garbageValue = "109132547" ) @Export("setComponent") final void setComponent(Component var1) { - this.component = var1; - } + this.component = var1; // L: 35 + } // L: 36 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "517256419" + garbageValue = "1712436925" ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); - } + this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 + } // L: 40 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "2140501062" + garbageValue = "-419314546" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component.getGraphics(), var1, var2, var3, var4); - } + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 + } // L: 44 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-1289290087" + garbageValue = "1962607429" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); - } catch (Exception var5) { - this.component.repaint(); + var1.drawImage(this.image, var2, var3, this.component); // L: 48 + } catch (Exception var5) { // L: 50 + this.component.repaint(); // L: 51 } - } + } // L: 53 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-1394783467" + descriptor = "(Ljava/awt/Graphics;IIIIB)V", + garbageValue = "-18" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - 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(); + Shape var6 = var1.getClip(); // L: 57 + var1.clipRect(var2, var3, var4, var5); // L: 58 + var1.drawImage(this.image, 0, 0, this.component); // L: 59 + var1.setClip(var6); // L: 60 + } catch (Exception var7) { // L: 62 + this.component.repaint(); // L: 63 } - } + } // L: 65 } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 1cc34d3b31..7b087bd14c 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,171 +3,171 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("ob") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; static { - Rasterizer2D_yClipStart = 0; - Rasterizer2D_yClipEnd = 0; - Rasterizer2D_xClipStart = 0; - Rasterizer2D_xClipEnd = 0; + Rasterizer2D_yClipStart = 0; // L: 11 + Rasterizer2D_yClipEnd = 0; // L: 12 + Rasterizer2D_xClipStart = 0; // L: 13 + Rasterizer2D_xClipEnd = 0; // L: 14 } protected Rasterizer2D() { - } + } // L: 16 - @ObfuscatedName("dp") + @ObfuscatedName("dw") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; - Rasterizer2D_width = var1; - Rasterizer2D_height = var2; - Rasterizer2D_setClip(0, 0, var1, 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 - @ObfuscatedName("dq") + @ObfuscatedName("dn") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { - Rasterizer2D_xClipStart = 0; - Rasterizer2D_yClipStart = 0; - Rasterizer2D_xClipEnd = Rasterizer2D_width; - Rasterizer2D_yClipEnd = Rasterizer2D_height; - } + Rasterizer2D_xClipStart = 0; // L: 26 + Rasterizer2D_yClipStart = 0; // L: 27 + Rasterizer2D_xClipEnd = Rasterizer2D_width; // L: 28 + Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 + } // L: 30 - @ObfuscatedName("du") + @ObfuscatedName("dc") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { + if (var0 < 0) { // L: 33 var0 = 0; } - if (var1 < 0) { + if (var1 < 0) { // L: 34 var1 = 0; } - if (var2 > Rasterizer2D_width) { + if (var2 > Rasterizer2D_width) { // L: 35 var2 = Rasterizer2D_width; } if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; + var3 = Rasterizer2D_height; // L: 36 } - Rasterizer2D_xClipStart = var0; - Rasterizer2D_yClipStart = var1; - Rasterizer2D_xClipEnd = var2; - Rasterizer2D_yClipEnd = var3; - } + Rasterizer2D_xClipStart = var0; // L: 37 + Rasterizer2D_yClipStart = var1; // L: 38 + Rasterizer2D_xClipEnd = var2; // L: 39 + Rasterizer2D_yClipEnd = var3; // L: 40 + } // L: 41 - @ObfuscatedName("dc") + @ObfuscatedName("dh") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { + if (Rasterizer2D_xClipStart < var0) { // L: 44 Rasterizer2D_xClipStart = var0; } - if (Rasterizer2D_yClipStart < var1) { + if (Rasterizer2D_yClipStart < var1) { // L: 45 Rasterizer2D_yClipStart = var1; } - if (Rasterizer2D_xClipEnd > var2) { + if (Rasterizer2D_xClipEnd > var2) { // L: 46 Rasterizer2D_xClipEnd = var2; } - if (Rasterizer2D_yClipEnd > var3) { + if (Rasterizer2D_yClipEnd > var3) { // L: 47 Rasterizer2D_yClipEnd = var3; } - } + } // L: 48 - @ObfuscatedName("dy") + @ObfuscatedName("du") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; - var0[1] = Rasterizer2D_yClipStart; - var0[2] = Rasterizer2D_xClipEnd; - var0[3] = Rasterizer2D_yClipEnd; - } + 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 - @ObfuscatedName("dl") + @ObfuscatedName("db") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; - Rasterizer2D_yClipStart = var0[1]; - Rasterizer2D_xClipEnd = var0[2]; - Rasterizer2D_yClipEnd = var0[3]; - } + 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 - @ObfuscatedName("df") + @ObfuscatedName("dp") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { - int var0 = 0; + int var0 = 0; // L: 65 int var1; - 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 = 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 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { + for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 77 78 } - } + } // L: 79 @ObfuscatedName("dj") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { - if (var2 == 0) { - Rasterizer2D_setPixel(var0, var1, var3); + if (var2 == 0) { // L: 82 + Rasterizer2D_setPixel(var0, var1, var3); // L: 83 } else { - if (var2 < 0) { + if (var2 < 0) { // L: 86 var2 = -var2; } - int var4 = var1 - var2; - if (var4 < Rasterizer2D_yClipStart) { + int var4 = var1 - var2; // L: 87 + if (var4 < Rasterizer2D_yClipStart) { // L: 88 var4 = Rasterizer2D_yClipStart; } - int var5 = var2 + var1 + 1; - if (var5 > Rasterizer2D_yClipEnd) { + int var5 = var2 + var1 + 1; // L: 89 + if (var5 > Rasterizer2D_yClipEnd) { // L: 90 var5 = Rasterizer2D_yClipEnd; } - 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) { + 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 var1 = var5; } @@ -175,99 +175,99 @@ public class Rasterizer2D extends DualNode { int var13; int var14; int var15; - while (var6 < var1) { - while (var11 <= var7 || var10 <= var7) { - var10 = var10 + var8 + var8; - var11 += var8++ + var8; + while (var6 < var1) { // L: 98 + while (var11 <= var7 || var10 <= var7) { // L: 99 + var10 = var10 + var8 + var8; // L: 100 + var11 += var8++ + var8; // L: 101 } - var12 = var0 - var8 + 1; - if (var12 < Rasterizer2D_xClipStart) { + var12 = var0 - var8 + 1; // L: 103 + if (var12 < Rasterizer2D_xClipStart) { // L: 104 var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; - if (var13 > Rasterizer2D_xClipEnd) { + var13 = var0 + var8; // L: 105 + if (var13 > Rasterizer2D_xClipEnd) { // L: 106 var13 = Rasterizer2D_xClipEnd; } - var14 = var12 + var6 * Rasterizer2D_width; + var14 = var12 + var6 * Rasterizer2D_width; // L: 107 - for (var15 = var12; var15 < var13; ++var15) { + for (var15 = var12; var15 < var13; ++var15) { // L: 108 Rasterizer2D_pixels[var14++] = var3; } - ++var6; - var10 -= var9-- + var9; - var11 -= var9 + var9; + ++var6; // L: 109 + var10 -= var9-- + var9; // L: 110 + var11 -= var9 + var9; // L: 111 } - var8 = var2; - var9 = var6 - var1; - var11 = var7 + var9 * var9; - var10 = var11 - var2; + var8 = var2; // L: 113 + var9 = var6 - var1; // L: 114 + var11 = var7 + var9 * var9; // L: 115 + var10 = var11 - var2; // L: 116 - for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { - while (var11 > var7 && var10 > var7) { - var11 -= var8-- + var8; - var10 -= var8 + var8; + 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 } - var12 = var0 - var8; - if (var12 < Rasterizer2D_xClipStart) { + var12 = var0 - var8; // L: 123 + if (var12 < Rasterizer2D_xClipStart) { // L: 124 var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; - if (var13 > Rasterizer2D_xClipEnd - 1) { + var13 = var0 + var8; // L: 125 + if (var13 > Rasterizer2D_xClipEnd - 1) { // L: 126 var13 = Rasterizer2D_xClipEnd - 1; } - var14 = var12 + var6 * Rasterizer2D_width; + var14 = var12 + var6 * Rasterizer2D_width; // L: 127 for (var15 = var12; var15 <= var13; ++var15) { - Rasterizer2D_pixels[var14++] = var3; + Rasterizer2D_pixels[var14++] = var3; // L: 128 } - ++var6; - var11 = var11 + var9 + var9; + ++var6; // L: 129 + var11 = var11 + var9 + var9; // L: 130 } } - } + } // L: 84 133 - @ObfuscatedName("dm") + @ObfuscatedName("dt") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var4 != 0) { - if (var4 == 256) { - drawCircle(var0, var1, var2, var3); + if (var4 != 0) { // L: 136 + if (var4 == 256) { // L: 137 + drawCircle(var0, var1, var2, var3); // L: 138 } else { - if (var2 < 0) { + if (var2 < 0) { // L: 141 var2 = -var2; } - 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) { + 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 var12 = Rasterizer2D_yClipStart; } - int var13 = var2 + var1 + 1; - if (var13 > Rasterizer2D_yClipEnd) { + int var13 = var2 + var1 + 1; // L: 151 + if (var13 > Rasterizer2D_yClipEnd) { // L: 152 var13 = Rasterizer2D_yClipEnd; } - 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) { + 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 var1 = var13; } @@ -279,561 +279,561 @@ public class Rasterizer2D extends DualNode { int var22; int var23; int var24; - while (var14 < var1) { - while (var19 <= var15 || var18 <= var15) { - var18 = var18 + var16 + var16; - var19 += var16++ + var16; + while (var14 < var1) { // L: 160 + while (var19 <= var15 || var18 <= var15) { // L: 161 + var18 = var18 + var16 + var16; // L: 162 + var19 += var16++ + var16; // L: 163 } - var20 = var0 - var16 + 1; - if (var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var16 + 1; // L: 165 + if (var20 < Rasterizer2D_xClipStart) { // L: 166 var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if (var21 > Rasterizer2D_xClipEnd) { + var21 = var0 + var16; // L: 167 + if (var21 > Rasterizer2D_xClipEnd) { // L: 168 var21 = Rasterizer2D_xClipEnd; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var14 * Rasterizer2D_width; // L: 169 - 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; + 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 } - ++var14; - var18 -= var17-- + var17; - var19 -= var17 + var17; + ++var14; // L: 177 + var18 -= var17-- + var17; // L: 178 + var19 -= var17 + var17; // L: 179 } - var16 = var2; - var17 = -var17; - var19 = var15 + var17 * var17; - var18 = var19 - var2; + var16 = var2; // L: 181 + var17 = -var17; // L: 182 + var19 = var15 + var17 * var17; // L: 183 + var18 = var19 - var2; // L: 184 - for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { - while (var19 > var15 && var18 > var15) { - var19 -= var16-- + var16; - var18 -= var16 + var16; + 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 } - var20 = var0 - var16; - if (var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var16; // L: 191 + if (var20 < Rasterizer2D_xClipStart) { // L: 192 var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if (var21 > Rasterizer2D_xClipEnd - 1) { + var21 = var0 + var16; // L: 193 + if (var21 > Rasterizer2D_xClipEnd - 1) { // L: 194 var21 = Rasterizer2D_xClipEnd - 1; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var14 * Rasterizer2D_width; // L: 195 - 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; + 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 } - ++var14; - var19 = var19 + var17 + var17; + ++var14; // L: 203 + var19 = var19 + var17 + var17; // L: 204 } } } - } + } // L: 139 207 - @ObfuscatedName("dt") + @ObfuscatedName("dy") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var0 < Rasterizer2D_xClipStart) { // L: 210 + var2 -= Rasterizer2D_xClipStart - var0; // L: 211 + var0 = Rasterizer2D_xClipStart; // L: 212 } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 214 + var3 -= Rasterizer2D_yClipStart - var1; // L: 215 + var1 = Rasterizer2D_yClipStart; // L: 216 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 218 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 219 var3 = Rasterizer2D_yClipEnd - var1; } - 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; + 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) { - 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; + 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; + var8 += var7; // L: 230 } - } + } // L: 232 - @ObfuscatedName("dr") + @ObfuscatedName("ds") @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 (var0 < Rasterizer2D_xClipStart) { // L: 235 + var2 -= Rasterizer2D_xClipStart - var0; // L: 236 + var0 = Rasterizer2D_xClipStart; // L: 237 } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 239 + var3 -= Rasterizer2D_yClipStart - var1; // L: 240 + var1 = Rasterizer2D_yClipStart; // L: 241 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 243 var2 = Rasterizer2D_xClipEnd - var0; } if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + var3 = Rasterizer2D_yClipEnd - var1; // L: 244 } - int var5 = Rasterizer2D_width - var2; - int var6 = var0 + Rasterizer2D_width * var1; + int var5 = Rasterizer2D_width - var2; // L: 245 + int var6 = var0 + Rasterizer2D_width * var1; // L: 246 - for (int var7 = -var3; var7 < 0; ++var7) { - for (int var8 = -var2; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = var4; + for (int var7 = -var3; var7 < 0; ++var7) { // L: 247 + for (int var8 = -var2; var8 < 0; ++var8) { // L: 248 + Rasterizer2D_pixels[var6++] = var4; // L: 249 } - var6 += var5; + var6 += var5; // L: 251 } - } + } // L: 253 - @ObfuscatedName("do") + @ObfuscatedName("de") @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) { - int var6 = 0; - int var7 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + 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 (var1 < Rasterizer2D_yClipStart) { - var6 += (Rasterizer2D_yClipStart - var1) * var7; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + 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 (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 268 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 269 var3 = Rasterizer2D_yClipEnd - var1; } - int var8 = Rasterizer2D_width - var2; - int var9 = var0 + Rasterizer2D_width * var1; + int var8 = Rasterizer2D_width - var2; // L: 270 + int var9 = var0 + Rasterizer2D_width * var1; // L: 271 - 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 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 var14 = -var2; var14 < 0; ++var14) { - Rasterizer2D_pixels[var9++] = var13; + for (int var14 = -var2; var14 < 0; ++var14) { // L: 276 + Rasterizer2D_pixels[var9++] = var13; // L: 277 } - var9 += var8; - var6 += var7; + var9 += var8; // L: 279 + var6 += var7; // L: 280 } } - } + } // L: 282 @ObfuscatedName("dg") @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) { - int var8 = 0; - int var9 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + 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 (var1 < Rasterizer2D_yClipStart) { - var8 += (Rasterizer2D_yClipStart - var1) * var9; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + 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 (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 297 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 298 var3 = Rasterizer2D_yClipEnd - var1; } - int var10 = Rasterizer2D_width - var2; - int var11 = var0 + Rasterizer2D_width * var1; + int var10 = Rasterizer2D_width - var2; // L: 299 + int var11 = var0 + Rasterizer2D_width * var1; // L: 300 - 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; + 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 } else { - 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); + 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 - for (int var19 = -var2; var19 < 0; ++var19) { - int var20 = Rasterizer2D_pixels[var11]; - if (var20 == 0) { - Rasterizer2D_pixels[var11++] = var18; + 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 } else { - var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); - Rasterizer2D_pixels[var11++] = var18 + var20; + var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); // L: 319 + Rasterizer2D_pixels[var11++] = var18 + var20; // L: 320 } } - var11 += var10; - var8 += var9; + var11 += var10; // L: 323 + var8 += var9; // L: 324 } } } - } + } // L: 326 - @ObfuscatedName("dv") + @ObfuscatedName("di") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0) { - if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { - int var8 = 0; - int var9 = 0; - if (var0 < 0) { - var8 -= var0; - var2 += var0; + 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 (var1 < 0) { - var9 -= var1; - var3 += var1; + if (var1 < 0) { // L: 337 + var9 -= var1; // L: 338 + var3 += var1; // L: 339 } - if (var0 + var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width - var0; + if (var0 + var2 > Rasterizer2D_width) { // L: 341 + var2 = Rasterizer2D_width - var0; // L: 342 } - if (var3 + var1 > Rasterizer2D_height) { - var3 = Rasterizer2D_height - var1; + if (var3 + var1 > Rasterizer2D_height) { // L: 344 + var3 = Rasterizer2D_height - var1; // L: 345 } - int var10 = var6.length / var7; - int var11 = Rasterizer2D_width - var2; - int var12 = var4 >>> 24; - int var13 = var5 >>> 24; + 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 var14; int var15; int var16; int var17; int var18; - if (var12 == 255 && var13 == 255) { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + if (var12 == 255 && var13 == 255) { // L: 351 + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 352 - 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) { + 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 Rasterizer2D_pixels[var14++] = var5; } else { - Rasterizer2D_pixels[var14++] = var4; + Rasterizer2D_pixels[var14++] = var4; // L: 358 } } - var14 += var11; + var14 += var11; // L: 360 } } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 364 - 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) { + 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 var19 = var5; } - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = Rasterizer2D_pixels[var14]; - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; - Rasterizer2D_pixels[var14++] = var23; + 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 } - var14 += var11; + var14 += var11; // L: 377 } } } } - } + } // L: 380 - @ObfuscatedName("di") + @ObfuscatedName("do") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, 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 - @ObfuscatedName("dw") + @ObfuscatedName("dr") @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); - 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); + 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 } - } + } // L: 396 - @ObfuscatedName("dn") + @ObfuscatedName("dz") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(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 (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 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 404 var2 = Rasterizer2D_xClipEnd - var0; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D_width * var1; // L: 405 - for (int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { // L: 406 Rasterizer2D_pixels[var4 + var5] = var3; } } - } + } // L: 407 - @ObfuscatedName("dh") + @ObfuscatedName("dx") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + 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 (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 415 var2 = Rasterizer2D_xClipEnd - var0; } - 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; + 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 - 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; + 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 } } - } + } // L: 431 - @ObfuscatedName("ds") + @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) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + 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 } - if (var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 439 var2 = Rasterizer2D_yClipEnd - var1; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D_width * var1; // L: 440 - for (int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { // L: 441 Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; } } - } + } // L: 442 - @ObfuscatedName("da") + @ObfuscatedName("dl") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + 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 (var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 450 var2 = Rasterizer2D_yClipEnd - var1; } - 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; + 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 - 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; + 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 } } - } + } // L: 467 - @ObfuscatedName("dk") + @ObfuscatedName("dm") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; - var3 -= var1; - if (var3 == 0) { - if (var2 >= 0) { + 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); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); // L: 474 } - } else if (var2 == 0) { - if (var3 >= 0) { + } else if (var2 == 0) { // L: 477 + if (var3 >= 0) { // L: 478 Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); + Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); // L: 479 } } else { - if (var3 + var2 < 0) { - var0 += var2; - var2 = -var2; - var1 += var3; - var3 = -var3; + if (var3 + var2 < 0) { // L: 482 + var0 += var2; // L: 483 + var2 = -var2; // L: 484 + var1 += var3; // L: 485 + var3 = -var3; // L: 486 } int var5; int var6; - 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 > 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 >= Rasterizer2D_xClipEnd) { + if (var2 >= Rasterizer2D_xClipEnd) { // L: 498 var2 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { - var6 = var1 >> 16; - if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { + while (var0 <= var2) { // L: 499 + var6 = var1 >> 16; // L: 500 + if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { // L: 501 Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; } - var1 += var5; - ++var0; + var1 += var5; // L: 502 + ++var0; // L: 503 } } else { - 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; + 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 } - if (var3 >= Rasterizer2D_yClipEnd) { + if (var3 >= Rasterizer2D_yClipEnd) { // L: 516 var3 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { - var6 = var0 >> 16; - if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { + while (var1 <= var3) { // L: 517 + var6 = var0 >> 16; // L: 518 + if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { // L: 519 Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; } - var0 += var5; - ++var1; + var0 += var5; // L: 520 + ++var1; // L: 521 } } } - } + } // L: 475 480 524 - @ObfuscatedName("dz") + @ObfuscatedName("dk") @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) { - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; + if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 + Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 } - } + } // L: 529 - @ObfuscatedName("de") + @ObfuscatedName("dv") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { - int var5 = var0 + Rasterizer2D_width * var1; + int var5 = var0 + Rasterizer2D_width * var1; // L: 532 - for (var1 = 0; var1 < var3.length; ++var1) { - int var6 = var5 + var3[var1]; + for (var1 = 0; var1 < var3.length; ++var1) { // L: 533 + int var6 = var5 + var3[var1]; // L: 534 - for (var0 = -var4[var1]; var0 < 0; ++var0) { + for (var0 = -var4[var1]; var0 < 0; ++var0) { // L: 535 Rasterizer2D_pixels[var6++] = var2; } - var5 += Rasterizer2D_width; + var5 += Rasterizer2D_width; // L: 536 } - } + } // L: 538 } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index e779aff00a..1ede735140 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,763 +3,773 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hx") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("l") - static boolean field2347; - @ObfuscatedName("q") - static boolean field2346; - @ObfuscatedName("f") + @ObfuscatedName("i") + static boolean field2365; + @ObfuscatedName("w") + static boolean field2344; + @ObfuscatedName("s") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("j") - public static boolean field2348; - @ObfuscatedName("m") + @ObfuscatedName("a") + public static boolean field2367; + @ObfuscatedName("o") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Lht;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("n") - static int[] field2368; - @ObfuscatedName("u") - static int[] field2369; - @ObfuscatedName("d") + @ObfuscatedName("f") + static int[] field2366; + @ObfuscatedName("h") + static int[] field2347; + @ObfuscatedName("v") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2347 = false; - field2346 = false; - Rasterizer3D_isLowDetailTexture = false; - field2348 = true; - Rasterizer3D_alpha = 0; - Rasterizer3D_zoom = 512; - Rasterizer3D_rowOffsets = new int[1024]; - Rasterizer3D_colorPalette = new int[65536]; - field2368 = new int[512]; - field2369 = new int[2048]; - Rasterizer3D_sine = new int[2048]; - Rasterizer3D_cosine = new int[2048]; + field2365 = false; // L: 8 + field2344 = false; // L: 9 + Rasterizer3D_isLowDetailTexture = false; // L: 10 + field2367 = 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 + field2366 = new int[512]; // L: 31 + field2347 = new int[2048]; // L: 32 + Rasterizer3D_sine = new int[2048]; // L: 33 + Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; - for (var0 = 1; var0 < 512; ++var0) { - field2368[var0] = 32768 / var0; + for (var0 = 1; var0 < 512; ++var0) { // L: 37 + field2366[var0] = 32768 / var0; // L: 38 } - for (var0 = 1; var0 < 2048; ++var0) { - field2369[var0] = 65536 / var0; + for (var0 = 1; var0 < 2048; ++var0) { // L: 40 + field2347[var0] = 65536 / var0; // L: 41 } - 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)); + 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 } - } + } // L: 47 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { - Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); - } + Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 + } // L: 55 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { - Rasterizer3D_clipWidth = var2 - var0; - Rasterizer3D_clipHeight = var3 - var1; - Rasterizer3D_method3(); - if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[InvDefinition.method2881(Rasterizer3D_clipHeight)]; + Rasterizer3D_clipWidth = var2 - var0; // L: 58 + Rasterizer3D_clipHeight = var3 - var1; // L: 59 + Rasterizer3D_method3(); // L: 60 + int var4; + int var5; + if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 + var5 = Rasterizer3D_clipHeight; // L: 63 + --var5; // L: 65 + var5 |= var5 >>> 1; // L: 66 + var5 |= var5 >>> 2; // L: 67 + var5 |= var5 >>> 4; // L: 68 + var5 |= var5 >>> 8; // L: 69 + var5 |= var5 >>> 16; // L: 70 + var4 = var5 + 1; // L: 71 + Rasterizer3D_rowOffsets = new int[var4]; // L: 73 } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 75 - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { - Rasterizer3D_rowOffsets[var5] = var4; - var4 += Rasterizer2D.Rasterizer2D_width; + for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 76 + Rasterizer3D_rowOffsets[var5] = var4; // L: 77 + var4 += Rasterizer2D.Rasterizer2D_width; // L: 78 } - } + } // L: 80 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - 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; - } + Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 83 + Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 84 + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 85 + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 86 + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 87 + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 88 + } // L: 89 - @ObfuscatedName("j") - public static final void method4122(int var0, int var1) { - 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("a") + public static final void method4205(int var0, int var1) { + int var2 = Rasterizer3D_rowOffsets[0]; // L: 92 + int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 93 + int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 94 + Rasterizer3D_clipMidX = var0 - var4; // L: 95 + Rasterizer3D_clipMidY = var1 - var3; // L: 96 + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 97 + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 98 + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 99 + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 100 + } // L: 101 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhu;)V" + descriptor = "(Lht;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; - } + Rasterizer3D_textureLoader = var0; // L: 104 + } // L: 105 - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); - } + Rasterizer3D_buildPalette(var0, 0, 512); // L: 108 + } // L: 109 - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; + int var4 = var2 * 128; // L: 112 - 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 var5 = var2; var5 < var3; ++var5) { // L: 113 + double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 114 + double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 115 - 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) { + for (int var10 = 0; var10 < 128; ++var10) { // L: 116 + double var11 = (double)var10 / 128.0D; // L: 117 + double var13 = var11; // L: 118 + double var15 = var11; // L: 119 + double var17 = var11; // L: 120 + if (var8 != 0.0D) { // L: 121 double var19; - if (var11 < 0.5D) { + if (var11 < 0.5D) { // L: 123 var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; + var19 = var11 + var8 - var11 * var8; // L: 124 } - double var21 = 2.0D * var11 - var19; - double var23 = var6 + 0.3333333333333333D; - if (var23 > 1.0D) { + double var21 = 2.0D * var11 - var19; // L: 125 + double var23 = var6 + 0.3333333333333333D; // L: 126 + if (var23 > 1.0D) { // L: 127 --var23; } - double var27 = var6 - 0.3333333333333333D; - if (var27 < 0.0D) { + double var27 = var6 - 0.3333333333333333D; // L: 129 + if (var27 < 0.0D) { // L: 130 ++var27; } - if (6.0D * var23 < 1.0D) { + if (6.0D * var23 < 1.0D) { // L: 131 var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { + } else if (2.0D * var23 < 1.0D) { // L: 132 var13 = var19; - } else if (3.0D * var23 < 2.0D) { + } else if (3.0D * var23 < 2.0D) { // L: 133 var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; + var13 = var21; // L: 134 } - if (6.0D * var6 < 1.0D) { + if (6.0D * var6 < 1.0D) { // L: 135 var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { + } else if (2.0D * var6 < 1.0D) { // L: 136 var15 = var19; - } else if (3.0D * var6 < 2.0D) { + } else if (3.0D * var6 < 2.0D) { // L: 137 var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; + var15 = var21; // L: 138 } - if (6.0D * var27 < 1.0D) { + if (6.0D * var27 < 1.0D) { // L: 139 var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { + } else if (2.0D * var27 < 1.0D) { // L: 140 var17 = var19; - } else if (3.0D * var27 < 2.0D) { + } else if (3.0D * var27 < 2.0D) { // L: 141 var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; + var17 = var21; // L: 142 } } - 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) { + int var29 = (int)(var13 * 256.0D); // L: 144 + int var20 = (int)(var15 * 256.0D); // L: 145 + int var30 = (int)(var17 * 256.0D); // L: 146 + int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 147 + var22 = Rasterizer3D_brighten(var22, var0); // L: 148 + if (var22 == 0) { // L: 149 var22 = 1; } - Rasterizer3D_colorPalette[var4++] = var22; + Rasterizer3D_colorPalette[var4++] = var22; // L: 150 } } - } + } // L: 153 - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; - double var5 = (double)(var0 >> 8 & 255) / 256.0D; - double var7 = (double)(var0 & 255) / 256.0D; - var3 = Math.pow(var3, var1); - var5 = Math.pow(var5, var1); - var7 = Math.pow(var7, var1); - int var9 = (int)(var3 * 256.0D); - int var10 = (int)(var5 * 256.0D); - int var11 = (int)(var7 * 256.0D); - return var11 + (var10 << 8) + (var9 << 16); + double var3 = (double)(var0 >> 16) / 256.0D; // L: 156 + double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 157 + double var7 = (double)(var0 & 255) / 256.0D; // L: 158 + var3 = Math.pow(var3, var1); // L: 159 + var5 = Math.pow(var5, var1); // L: 160 + var7 = Math.pow(var7, var1); // L: 161 + int var9 = (int)(var3 * 256.0D); // L: 162 + int var10 = (int)(var5 * 256.0D); // L: 163 + int var11 = (int)(var7 * 256.0D); // L: 164 + return var11 + (var10 << 8) + (var9 << 16); // L: 165 } - @ObfuscatedName("e") - public static void method4127(int var0, int var1, int var2) { - field2347 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; - } + @ObfuscatedName("j") + public static void method4210(int var0, int var1, int var2) { + field2365 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 169 + } // L: 170 - @ObfuscatedName("i") - static final void method4128(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = var4 - var3; - int var10 = var1 - var0; - int var11 = var5 - var3; - int var12 = var2 - var0; - int var13 = var7 - var6; - int var14 = var8 - var6; + @ObfuscatedName("b") + static final void method4211(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + int var9 = var4 - var3; // L: 173 + int var10 = var1 - var0; // L: 174 + int var11 = var5 - var3; // L: 175 + int var12 = var2 - var0; // L: 176 + int var13 = var7 - var6; // L: 177 + int var14 = var8 - var6; // L: 178 int var15; - if (var2 != var1) { + if (var2 != var1) { // L: 180 var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; + var15 = 0; // L: 181 } int var16; - if (var0 != var1) { + if (var0 != var1) { // L: 183 var16 = (var9 << 14) / var10; } else { - var16 = 0; + var16 = 0; // L: 184 } int var17; - if (var0 != var2) { + if (var0 != var2) { // L: 186 var17 = (var11 << 14) / var12; } else { - var17 = 0; + var17 = 0; // L: 187 } - 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) { + int var18 = var9 * var12 - var11 * var10; // L: 188 + if (var18 != 0) { // L: 189 + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 190 + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 191 + if (var0 <= var1 && var0 <= var2) { // L: 192 + if (var0 < Rasterizer3D_clipHeight) { // L: 193 + if (var1 > Rasterizer3D_clipHeight) { // L: 194 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 195 var2 = Rasterizer3D_clipHeight; } - 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; + var6 = var19 + ((var6 << 8) - var3 * var19); // L: 196 + if (var1 < var2) { // L: 197 + var5 = var3 <<= 14; // L: 198 + if (var0 < 0) { // L: 199 + var5 -= var0 * var17; // L: 200 + var3 -= var0 * var16; // L: 201 + var6 -= var0 * var20; // L: 202 + var0 = 0; // L: 203 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var15 * var1; - var1 = 0; + var4 <<= 14; // L: 205 + if (var1 < 0) { // L: 206 + var4 -= var15 * var1; // L: 207 + var1 = 0; // L: 208 } - if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 210 + var2 -= var1; // L: 231 + var1 -= var0; // L: 232 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 233 while (true) { - --var1; + --var1; // L: 234 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 241 if (var2 < 0) { - return; + return; // L: 248 } - 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, var4 >> 14, var5 >> 14, var6, var19); // L: 242 + var5 += var17; // L: 243 + var4 += var15; // L: 244 + var6 += var20; // L: 245 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 246 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 235 + var5 += var17; // L: 236 + var3 += var16; // L: 237 + var6 += var20; // L: 238 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 239 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 211 + var1 -= var0; // L: 212 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 213 while (true) { - --var1; + --var1; // L: 214 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 221 if (var2 < 0) { - return; + return; // L: 228 } - 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, var4 >> 14, var6, var19); // L: 222 + var5 += var17; // L: 223 + var4 += var15; // L: 224 + var6 += var20; // L: 225 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 215 + var5 += var17; // L: 216 + var3 += var16; // L: 217 + var6 += var20; // L: 218 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 219 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; + var4 = var3 <<= 14; // L: 252 + if (var0 < 0) { // L: 253 + var4 -= var0 * var17; // L: 254 + var3 -= var0 * var16; // L: 255 + var6 -= var0 * var20; // L: 256 + var0 = 0; // L: 257 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var15 * var2; - var2 = 0; + var5 <<= 14; // L: 259 + if (var2 < 0) { // L: 260 + var5 -= var15 * var2; // L: 261 + var2 = 0; // L: 262 } - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 264 + var1 -= var2; // L: 265 + var2 -= var0; // L: 266 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 267 while (true) { - --var2; + --var2; // L: 268 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 275 if (var1 < 0) { - return; + return; // L: 282 } - 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, var5 >> 14, var3 >> 14, var6, var19); // L: 276 + var5 += var15; // L: 277 + var3 += var16; // L: 278 + var6 += var20; // L: 279 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 269 + var4 += var17; // L: 270 + var3 += var16; // L: 271 + var6 += var20; // L: 272 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 273 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 285 + var2 -= var0; // L: 286 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 287 while (true) { - --var2; + --var2; // L: 288 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 295 if (var1 < 0) { - return; + return; // L: 302 } - 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, var5 >> 14, var6, var19); // L: 296 + var5 += var15; // L: 297 + var3 += var16; // L: 298 + var6 += var20; // L: 299 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 300 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 289 + var4 += var17; // L: 290 + var3 += var16; // L: 291 + var6 += var20; // L: 292 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 293 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 306 + if (var1 < Rasterizer3D_clipHeight) { // L: 307 + if (var2 > Rasterizer3D_clipHeight) { // L: 308 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 309 var0 = Rasterizer3D_clipHeight; } - 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; + var7 = var19 + ((var7 << 8) - var19 * var4); // L: 310 + if (var2 < var0) { // L: 311 + var3 = var4 <<= 14; // L: 312 + if (var1 < 0) { // L: 313 + var3 -= var16 * var1; // L: 314 + var4 -= var15 * var1; // L: 315 + var7 -= var20 * var1; // L: 316 + var1 = 0; // L: 317 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var17 * var2; - var2 = 0; + var5 <<= 14; // L: 319 + if (var2 < 0) { // L: 320 + var5 -= var17 * var2; // L: 321 + var2 = 0; // L: 322 } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 324 + var0 -= var2; // L: 345 + var2 -= var1; // L: 346 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 347 while (true) { - --var2; + --var2; // L: 348 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 355 if (var0 < 0) { - return; + return; // L: 362 } - 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, var5 >> 14, var3 >> 14, var7, var19); // L: 356 + var3 += var16; // L: 357 + var5 += var17; // L: 358 + var7 += var20; // L: 359 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 360 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 349 + var3 += var16; // L: 350 + var4 += var15; // L: 351 + var7 += var20; // L: 352 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 353 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 325 + var2 -= var1; // L: 326 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 327 while (true) { - --var2; + --var2; // L: 328 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 335 if (var0 < 0) { - return; + return; // L: 342 } - 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, var5 >> 14, var7, var19); // L: 336 + var3 += var16; // L: 337 + var5 += var17; // L: 338 + var7 += var20; // L: 339 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 329 + var3 += var16; // L: 330 + var4 += var15; // L: 331 + var7 += var20; // L: 332 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 333 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 366 + if (var1 < 0) { // L: 367 + var5 -= var16 * var1; // L: 368 + var4 -= var15 * var1; // L: 369 + var7 -= var20 * var1; // L: 370 + var1 = 0; // L: 371 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var17; - var0 = 0; + var3 <<= 14; // L: 373 + if (var0 < 0) { // L: 374 + var3 -= var0 * var17; // L: 375 + var0 = 0; // L: 376 } - if (var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var16 < var15) { // L: 378 + var2 -= var0; // L: 379 + var0 -= var1; // L: 380 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 381 while (true) { - --var0; + --var0; // L: 382 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 389 if (var2 < 0) { - return; + return; // L: 396 } - 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, var3 >> 14, var4 >> 14, var7, var19); // L: 390 + var3 += var17; // L: 391 + var4 += var15; // L: 392 + var7 += var20; // L: 393 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 383 + var5 += var16; // L: 384 + var4 += var15; // L: 385 + var7 += var20; // L: 386 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 387 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 399 + var0 -= var1; // L: 400 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 401 while (true) { - --var0; + --var0; // L: 402 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 409 if (var2 < 0) { - return; + return; // L: 416 } - 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, var3 >> 14, var7, var19); // L: 410 + var3 += var17; // L: 411 + var4 += var15; // L: 412 + var7 += var20; // L: 413 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 414 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 403 + var5 += var16; // L: 404 + var4 += var15; // L: 405 + var7 += var20; // L: 406 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 407 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 421 + if (var0 > Rasterizer3D_clipHeight) { // L: 422 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 423 var1 = Rasterizer3D_clipHeight; } - 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; + var8 = var19 + ((var8 << 8) - var5 * var19); // L: 424 + if (var0 < var1) { // L: 425 + var4 = var5 <<= 14; // L: 426 + if (var2 < 0) { // L: 427 + var4 -= var15 * var2; // L: 428 + var5 -= var17 * var2; // L: 429 + var8 -= var20 * var2; // L: 430 + var2 = 0; // L: 431 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var16; - var0 = 0; + var3 <<= 14; // L: 433 + if (var0 < 0) { // L: 434 + var3 -= var0 * var16; // L: 435 + var0 = 0; // L: 436 } - if (var15 < var17) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 438 + var1 -= var0; // L: 439 + var0 -= var2; // L: 440 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 441 while (true) { - --var0; + --var0; // L: 442 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 449 if (var1 < 0) { - return; + return; // L: 456 } - 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, var3 >> 14, var8, var19); // L: 450 + var4 += var15; // L: 451 + var3 += var16; // L: 452 + var8 += var20; // L: 453 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 443 + var4 += var15; // L: 444 + var5 += var17; // L: 445 + var8 += var20; // L: 446 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 447 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 459 + var0 -= var2; // L: 460 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 461 while (true) { - --var0; + --var0; // L: 462 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 469 if (var1 < 0) { - return; + return; // L: 476 } - 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, var3 >> 14, var4 >> 14, var8, var19); // L: 470 + var4 += var15; // L: 471 + var3 += var16; // L: 472 + var8 += var20; // L: 473 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 474 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 463 + var4 += var15; // L: 464 + var5 += var17; // L: 465 + var8 += var20; // L: 466 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 467 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 480 + if (var2 < 0) { // L: 481 + var3 -= var15 * var2; // L: 482 + var5 -= var17 * var2; // L: 483 + var8 -= var20 * var2; // L: 484 + var2 = 0; // L: 485 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var16 * var1; - var1 = 0; + var4 <<= 14; // L: 487 + if (var1 < 0) { // L: 488 + var4 -= var16 * var1; // L: 489 + var1 = 0; // L: 490 } - if (var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 492 + var0 -= var1; // L: 493 + var1 -= var2; // L: 494 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 495 while (true) { - --var1; + --var1; // L: 496 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 503 if (var0 < 0) { - return; + return; // L: 510 } - 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, var4 >> 14, var5 >> 14, var8, var19); // L: 504 + var4 += var16; // L: 505 + var5 += var17; // L: 506 + var8 += var20; // L: 507 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 497 + var3 += var15; // L: 498 + var5 += var17; // L: 499 + var8 += var20; // L: 500 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 501 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 513 + var1 -= var2; // L: 514 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 515 while (true) { - --var1; + --var1; // L: 516 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 523 if (var0 < 0) { - return; + return; // L: 530 } - 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, var4 >> 14, var8, var19); // L: 524 + var4 += var16; // L: 525 + var5 += var17; // L: 526 + var8 += var20; // L: 527 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 528 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 517 + var3 += var15; // L: 518 + var5 += var17; // L: 519 + var8 += var20; // L: 520 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 521 } } } @@ -767,1298 +777,1305 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @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 (field2347) { - if (var5 > Rasterizer3D_clipWidth) { + if (field2365) { // L: 537 + if (var5 > Rasterizer3D_clipWidth) { // L: 538 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { + if (var4 < 0) { // L: 539 var4 = 0; } } - if (var4 < var5) { - var1 += var4; - var6 += var4 * var7; + if (var4 < var5) { // L: 541 + var1 += var4; // L: 542 + var6 += var4 * var7; // L: 543 int var8; int var9; int var10; - if (field2348) { - var3 = var5 - var4 >> 2; - var7 <<= 2; - if (Rasterizer3D_alpha == 0) { - if (var3 > 0) { + int var11; + if (field2367) { // L: 544 + var3 = var5 - var4 >> 2; // L: 545 + var7 <<= 2; // L: 546 + if (Rasterizer3D_alpha == 0) { // L: 547 + if (var3 > 0) { // L: 548 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - --var3; + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 550 + var2 = Rasterizer3D_colorPalette[var8]; // L: 551 + var6 += var7; // L: 552 + var0[var1++] = var2; // L: 553 + var0[var1++] = var2; // L: 554 + var0[var1++] = var2; // L: 555 + var0[var1++] = var2; // L: 556 + --var3; // L: 557 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var3 = var5 - var4 & 3; // L: 559 + if (var3 > 0) { // L: 560 + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 561 + var2 = Rasterizer3D_colorPalette[var8]; // L: 562 do { - var0[var1++] = var2; - --var3; + var0[var1++] = var2; // L: 564 + --var3; // L: 565 } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; - if (var3 > 0) { + var8 = Rasterizer3D_alpha; // L: 569 + var9 = 256 - Rasterizer3D_alpha; // L: 570 + if (var3 > 0) { // L: 571 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 573 + var2 = Rasterizer3D_colorPalette[var10]; // L: 574 + var6 += var7; // L: 575 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 576 + var11 = var0[var1]; // L: 577 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 578 + var11 = var0[var1]; // L: 579 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 580 + var11 = var0[var1]; // L: 581 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 582 + var11 = var0[var1]; // L: 583 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 584 + --var3; // L: 585 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var3 = var5 - var4 & 3; // L: 587 + if (var3 > 0) { // L: 588 + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 589 + var2 = Rasterizer3D_colorPalette[var10]; // L: 590 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 591 do { - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var11 = var0[var1]; // L: 593 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 594 + --var3; // L: 595 } while(var3 > 0); } } } else { - var3 = var5 - var4; - if (Rasterizer3D_alpha == 0) { + var3 = var5 - var4; // L: 601 + if (Rasterizer3D_alpha == 0) { // L: 602 do { - var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - --var3; + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 604 + var0[var1++] = Rasterizer3D_colorPalette[var8]; // L: 605 + var6 += var7; // L: 606 + --var3; // L: 607 } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; + var8 = Rasterizer3D_alpha; // L: 610 + var9 = 256 - Rasterizer3D_alpha; // L: 611 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 613 + var2 = Rasterizer3D_colorPalette[var10]; // L: 614 + var6 += var7; // L: 615 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 616 + var11 = var0[var1]; // L: 617 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 618 + --var3; // L: 619 } while(var3 > 0); } } } - } + } // L: 598 621 - @ObfuscatedName("w") - public static final void method4130(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; - if (var0 != var1) { + @ObfuscatedName("y") + public static final void method4213(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; // L: 626 + if (var0 != var1) { // L: 627 var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; - if (var2 != var1) { + int var8 = 0; // L: 628 + if (var2 != var1) { // L: 629 var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; - if (var0 != var2) { + int var9 = 0; // L: 630 + if (var0 != var2) { // L: 631 var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 632 + if (var0 < Rasterizer3D_clipHeight) { // L: 633 + if (var1 > Rasterizer3D_clipHeight) { // L: 634 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 635 var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + if (var1 < var2) { // L: 636 + var5 = var3 <<= 14; // L: 637 + if (var0 < 0) { // L: 638 + var5 -= var0 * var9; // L: 639 + var3 -= var0 * var7; // L: 640 + var0 = 0; // L: 641 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var8 * var1; - var1 = 0; + var4 <<= 14; // L: 643 + if (var1 < 0) { // L: 644 + var4 -= var8 * var1; // L: 645 + var1 = 0; // L: 646 } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 648 + var2 -= var1; // L: 649 + var1 -= var0; // L: 650 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 651 while (true) { - --var1; + --var1; // L: 652 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 658 if (var2 < 0) { - return; + return; // L: 664 } - 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, var4 >> 14); // L: 659 + var5 += var9; // L: 660 + var4 += var8; // L: 661 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 662 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 653 + var5 += var9; // L: 654 + var3 += var7; // L: 655 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 656 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 667 + var1 -= var0; // L: 668 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 669 while (true) { - --var1; + --var1; // L: 670 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 676 if (var2 < 0) { - return; + return; // L: 682 } - 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, var4 >> 14, var5 >> 14); // L: 677 + var5 += var9; // L: 678 + var4 += var8; // L: 679 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 680 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 671 + var5 += var9; // L: 672 + var3 += var7; // L: 673 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 674 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + var4 = var3 <<= 14; // L: 686 + if (var0 < 0) { // L: 687 + var4 -= var0 * var9; // L: 688 + var3 -= var0 * var7; // L: 689 + var0 = 0; // L: 690 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var8 * var2; - var2 = 0; + var5 <<= 14; // L: 692 + if (var2 < 0) { // L: 693 + var5 -= var8 * var2; // L: 694 + var2 = 0; // L: 695 } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 697 + var1 -= var2; // L: 716 + var2 -= var0; // L: 717 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 718 while (true) { - --var2; + --var2; // L: 719 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 725 if (var1 < 0) { - return; + return; // L: 731 } - 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, var5 >> 14); // L: 726 + var5 += var8; // L: 727 + var3 += var7; // L: 728 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 729 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 720 + var4 += var9; // L: 721 + var3 += var7; // L: 722 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 723 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 698 + var2 -= var0; // L: 699 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 700 while (true) { - --var2; + --var2; // L: 701 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 707 if (var1 < 0) { - return; + return; // L: 713 } - 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, var5 >> 14, var3 >> 14); // L: 708 + var5 += var8; // L: 709 + var3 += var7; // L: 710 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 711 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 702 + var4 += var9; // L: 703 + var3 += var7; // L: 704 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 705 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 735 + if (var1 < Rasterizer3D_clipHeight) { // L: 736 + if (var2 > Rasterizer3D_clipHeight) { // L: 737 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 738 var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + if (var2 < var0) { // L: 739 + var3 = var4 <<= 14; // L: 740 + if (var1 < 0) { // L: 741 + var3 -= var7 * var1; // L: 742 + var4 -= var8 * var1; // L: 743 + var1 = 0; // L: 744 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var9 * var2; - var2 = 0; + var5 <<= 14; // L: 746 + if (var2 < 0) { // L: 747 + var5 -= var9 * var2; // L: 748 + var2 = 0; // L: 749 } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 751 + var0 -= var2; // L: 752 + var2 -= var1; // L: 753 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 754 while (true) { - --var2; + --var2; // L: 755 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 761 if (var0 < 0) { - return; + return; // L: 767 } - 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, var5 >> 14); // L: 762 + var3 += var7; // L: 763 + var5 += var9; // L: 764 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 765 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 756 + var3 += var7; // L: 757 + var4 += var8; // L: 758 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 759 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 770 + var2 -= var1; // L: 771 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 772 while (true) { - --var2; + --var2; // L: 773 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 779 if (var0 < 0) { - return; + return; // L: 785 } - 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, var5 >> 14, var3 >> 14); // L: 780 + var3 += var7; // L: 781 + var5 += var9; // L: 782 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 783 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 774 + var3 += var7; // L: 775 + var4 += var8; // L: 776 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 777 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 789 + if (var1 < 0) { // L: 790 + var5 -= var7 * var1; // L: 791 + var4 -= var8 * var1; // L: 792 + var1 = 0; // L: 793 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var9; - var0 = 0; + var3 <<= 14; // L: 795 + if (var0 < 0) { // L: 796 + var3 -= var0 * var9; // L: 797 + var0 = 0; // L: 798 } - if (var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var7 < var8) { // L: 800 + var2 -= var0; // L: 801 + var0 -= var1; // L: 802 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 803 while (true) { - --var0; + --var0; // L: 804 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 810 if (var2 < 0) { - return; + return; // L: 816 } - 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, var3 >> 14, var4 >> 14); // L: 811 + var3 += var9; // L: 812 + var4 += var8; // L: 813 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 814 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 805 + var5 += var7; // L: 806 + var4 += var8; // L: 807 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 808 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 819 + var0 -= var1; // L: 820 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 821 while (true) { - --var0; + --var0; // L: 822 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 828 if (var2 < 0) { - return; + return; // L: 834 } - 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, var3 >> 14); // L: 829 + var3 += var9; // L: 830 + var4 += var8; // L: 831 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 832 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 823 + var5 += var7; // L: 824 + var4 += var8; // L: 825 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 826 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 839 + if (var0 > Rasterizer3D_clipHeight) { // L: 840 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 841 var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + if (var0 < var1) { // L: 842 + var4 = var5 <<= 14; // L: 843 + if (var2 < 0) { // L: 844 + var4 -= var8 * var2; // L: 845 + var5 -= var9 * var2; // L: 846 + var2 = 0; // L: 847 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var7; - var0 = 0; + var3 <<= 14; // L: 849 + if (var0 < 0) { // L: 850 + var3 -= var0 * var7; // L: 851 + var0 = 0; // L: 852 } - if (var8 < var9) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 854 + var1 -= var0; // L: 855 + var0 -= var2; // L: 856 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 857 while (true) { - --var0; + --var0; // L: 858 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 864 if (var1 < 0) { - return; + return; // L: 870 } - 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, var3 >> 14); // L: 865 + var4 += var8; // L: 866 + var3 += var7; // L: 867 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 868 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 859 + var4 += var8; // L: 860 + var5 += var9; // L: 861 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 862 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 873 + var0 -= var2; // L: 874 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 875 while (true) { - --var0; + --var0; // L: 876 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 882 if (var1 < 0) { - return; + return; // L: 888 } - 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, var3 >> 14, var4 >> 14); // L: 883 + var4 += var8; // L: 884 + var3 += var7; // L: 885 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 886 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 877 + var4 += var8; // L: 878 + var5 += var9; // L: 879 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 880 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 892 + if (var2 < 0) { // L: 893 + var3 -= var8 * var2; // L: 894 + var5 -= var9 * var2; // L: 895 + var2 = 0; // L: 896 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var7 * var1; - var1 = 0; + var4 <<= 14; // L: 898 + if (var1 < 0) { // L: 899 + var4 -= var7 * var1; // L: 900 + var1 = 0; // L: 901 } - if (var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 903 + var0 -= var1; // L: 904 + var1 -= var2; // L: 905 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 906 while (true) { - --var1; + --var1; // L: 907 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 913 if (var0 < 0) { - return; + return; // L: 919 } - 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, var4 >> 14, var5 >> 14); // L: 914 + var4 += var7; // L: 915 + var5 += var9; // L: 916 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 917 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 908 + var3 += var8; // L: 909 + var5 += var9; // L: 910 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 911 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 922 + var1 -= var2; // L: 923 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 924 while (true) { - --var1; + --var1; // L: 925 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 931 if (var0 < 0) { - return; + return; // L: 937 } - 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, var4 >> 14); // L: 932 + var4 += var7; // L: 933 + var5 += var9; // L: 934 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 935 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 926 + var3 += var8; // L: 927 + var5 += var9; // L: 928 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 929 } } } } } - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2347) { - if (var5 > Rasterizer3D_clipWidth) { + if (field2365) { // L: 944 + if (var5 > Rasterizer3D_clipWidth) { // L: 945 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { + if (var4 < 0) { // L: 946 var4 = 0; } } - if (var4 < var5) { - var1 += var4; - var3 = var5 - var4 >> 2; - if (Rasterizer3D_alpha != 0) { - if (Rasterizer3D_alpha == 254) { + if (var4 < var5) { // L: 948 + var1 += var4; // L: 949 + var3 = var5 - var4 >> 2; // L: 950 + if (Rasterizer3D_alpha != 0) { // L: 951 + if (Rasterizer3D_alpha == 254) { // L: 963 while (true) { - --var3; + --var3; // L: 964 if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 970 while (true) { - --var3; + --var3; // L: 971 if (var3 < 0) { - return; + return; // L: 995 } - var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; // L: 972 } } - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; // L: 965 + var0[var1++] = var0[var1]; // L: 966 + var0[var1++] = var0[var1]; // L: 967 + var0[var1++] = var0[var1]; // L: 968 } } else { - int var6 = Rasterizer3D_alpha; - int var7 = 256 - Rasterizer3D_alpha; - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + int var6 = Rasterizer3D_alpha; // L: 976 + int var7 = 256 - Rasterizer3D_alpha; // L: 977 + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 978 while (true) { - --var3; + --var3; // L: 979 int var8; if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 989 while (true) { - --var3; + --var3; // L: 990 if (var3 < 0) { return; } - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; // L: 991 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 992 } } - 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]; // L: 980 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 981 + var8 = var0[var1]; // L: 982 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 983 + var8 = var0[var1]; // L: 984 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 985 + var8 = var0[var1]; // L: 986 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 987 } } } else { while (true) { - --var3; + --var3; // L: 952 if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 958 while (true) { - --var3; + --var3; // L: 959 if (var3 < 0) { return; } - var0[var1++] = var2; + var0[var1++] = var2; // L: 960 } } - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; + var0[var1++] = var2; // L: 953 + var0[var1++] = var2; // L: 954 + var0[var1++] = var2; // L: 955 + var0[var1++] = var2; // L: 956 } } } } - @ObfuscatedName("v") - static final void method4132(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); + @ObfuscatedName("t") + static final void method4215(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: 998 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method4128(var0, var1, var2, var3, var4, var5, method4145(var20, var6), method4145(var20, var7), method4145(var20, var8)); + if (var19 == null) { // L: 999 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1000 + method4211(var0, var1, var2, var3, var4, var5, method4246(var20, var6), method4246(var20, var7), method4246(var20, var8)); // L: 1001 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2346 = Rasterizer3D_textureLoader.vmethod4565(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) { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1004 + field2344 = Rasterizer3D_textureLoader.vmethod4636(var18); // L: 1005 + var20 = var4 - var3; // L: 1006 + int var21 = var1 - var0; // L: 1007 + int var22 = var5 - var3; // L: 1008 + int var23 = var2 - var0; // L: 1009 + int var24 = var7 - var6; // L: 1010 + int var25 = var8 - var6; // L: 1011 + int var26 = 0; // L: 1012 + if (var0 != var1) { // L: 1013 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 1014 + if (var2 != var1) { // L: 1015 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 1016 + if (var0 != var2) { // L: 1017 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; - if (var29 != 0) { - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 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 var29 = var20 * var23 - var22 * var21; // L: 1018 + if (var29 != 0) { // L: 1019 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1020 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1021 + var10 = var9 - var10; // L: 1022 + var13 = var12 - var13; // L: 1023 + var16 = var15 - var16; // L: 1024 + var11 -= var9; // L: 1025 + var14 -= var12; // L: 1026 + var17 -= var15; // L: 1027 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1028 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1029 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1030 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1031 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1032 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1033 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1034 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1035 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1036 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1037 + if (var0 < Rasterizer3D_clipHeight) { // L: 1038 + if (var1 > Rasterizer3D_clipHeight) { // L: 1039 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1040 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1041 + if (var1 < var2) { // L: 1042 + var5 = var3 <<= 14; // L: 1043 + if (var0 < 0) { // L: 1044 + var5 -= var0 * var28; // L: 1045 + var3 -= var0 * var26; // L: 1046 + var6 -= var0 * var31; // L: 1047 + var0 = 0; // L: 1048 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1050 + if (var1 < 0) { // L: 1051 + var4 -= var27 * var1; // L: 1052 + var1 = 0; // L: 1053 } - 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]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1055 + var32 += var34 * var41; // L: 1056 + var35 += var37 * var41; // L: 1057 + var38 += var40 * var41; // L: 1058 + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1059 + var2 -= var1; // L: 1086 + var1 -= var0; // L: 1087 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1088 while (true) { - --var1; + --var1; // L: 1089 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1099 if (var2 < 0) { - return; + return; // L: 1109 } - 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, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1100 + var5 += var28; // L: 1101 + var4 += var27; // L: 1102 + var6 += var31; // L: 1103 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1104 + var32 += var34; // L: 1105 + var35 += var37; // L: 1106 + var38 += var40; // L: 1107 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1090 + var5 += var28; // L: 1091 + var3 += var26; // L: 1092 + var6 += var31; // L: 1093 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1094 + var32 += var34; // L: 1095 + var35 += var37; // L: 1096 + var38 += var40; // L: 1097 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1060 + var1 -= var0; // L: 1061 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1062 while (true) { - --var1; + --var1; // L: 1063 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1073 if (var2 < 0) { - return; + return; // L: 1083 } - 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, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1074 + var5 += var28; // L: 1075 + var4 += var27; // L: 1076 + var6 += var31; // L: 1077 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1078 + var32 += var34; // L: 1079 + var35 += var37; // L: 1080 + var38 += var40; // L: 1081 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1064 + var5 += var28; // L: 1065 + var3 += var26; // L: 1066 + var6 += var31; // L: 1067 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1068 + var32 += var34; // L: 1069 + var35 += var37; // L: 1070 + var38 += var40; // L: 1071 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1113 + if (var0 < 0) { // L: 1114 + var4 -= var0 * var28; // L: 1115 + var3 -= var0 * var26; // L: 1116 + var6 -= var0 * var31; // L: 1117 + var0 = 0; // L: 1118 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 1120 + if (var2 < 0) { // L: 1121 + var5 -= var27 * var2; // L: 1122 + var2 = 0; // L: 1123 } - 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]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1125 + var32 += var34 * var41; // L: 1126 + var35 += var37 * var41; // L: 1127 + var38 += var40 * var41; // L: 1128 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1129 + var1 -= var2; // L: 1130 + var2 -= var0; // L: 1131 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1132 while (true) { - --var2; + --var2; // L: 1133 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1143 if (var1 < 0) { - return; + return; // L: 1153 } - 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1144 + var5 += var27; // L: 1145 + var3 += var26; // L: 1146 + var6 += var31; // L: 1147 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1148 + var32 += var34; // L: 1149 + var35 += var37; // L: 1150 + var38 += var40; // L: 1151 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1134 + var4 += var28; // L: 1135 + var3 += var26; // L: 1136 + var6 += var31; // L: 1137 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1138 + var32 += var34; // L: 1139 + var35 += var37; // L: 1140 + var38 += var40; // L: 1141 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 1156 + var2 -= var0; // L: 1157 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1158 while (true) { - --var2; + --var2; // L: 1159 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1169 if (var1 < 0) { - return; + return; // L: 1179 } - 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, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1170 + var5 += var27; // L: 1171 + var3 += var26; // L: 1172 + var6 += var31; // L: 1173 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1174 + var32 += var34; // L: 1175 + var35 += var37; // L: 1176 + var38 += var40; // L: 1177 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1160 + var4 += var28; // L: 1161 + var3 += var26; // L: 1162 + var6 += var31; // L: 1163 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1164 + var32 += var34; // L: 1165 + var35 += var37; // L: 1166 + var38 += var40; // L: 1167 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 1183 + if (var1 < Rasterizer3D_clipHeight) { // L: 1184 + if (var2 > Rasterizer3D_clipHeight) { // L: 1185 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 1186 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1187 + if (var2 < var0) { // L: 1188 + var3 = var4 <<= 14; // L: 1189 + if (var1 < 0) { // L: 1190 + var3 -= var26 * var1; // L: 1191 + var4 -= var27 * var1; // L: 1192 + var7 -= var31 * var1; // L: 1193 + var1 = 0; // L: 1194 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 1196 + if (var2 < 0) { // L: 1197 + var5 -= var28 * var2; // L: 1198 + var2 = 0; // L: 1199 } - 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]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 1201 + var32 += var34 * var41; // L: 1202 + var35 += var37 * var41; // L: 1203 + var38 += var40 * var41; // L: 1204 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1205 + var0 -= var2; // L: 1232 + var2 -= var1; // L: 1233 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1234 while (true) { - --var2; + --var2; // L: 1235 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1245 if (var0 < 0) { - return; + return; // L: 1255 } - 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, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1246 + var3 += var26; // L: 1247 + var5 += var28; // L: 1248 + var7 += var31; // L: 1249 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1250 + var32 += var34; // L: 1251 + var35 += var37; // L: 1252 + var38 += var40; // L: 1253 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1236 + var3 += var26; // L: 1237 + var4 += var27; // L: 1238 + var7 += var31; // L: 1239 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1240 + var32 += var34; // L: 1241 + var35 += var37; // L: 1242 + var38 += var40; // L: 1243 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 1206 + var2 -= var1; // L: 1207 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1208 while (true) { - --var2; + --var2; // L: 1209 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1219 if (var0 < 0) { - return; + return; // L: 1229 } - 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, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1220 + var3 += var26; // L: 1221 + var5 += var28; // L: 1222 + var7 += var31; // L: 1223 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1224 + var32 += var34; // L: 1225 + var35 += var37; // L: 1226 + var38 += var40; // L: 1227 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1210 + var3 += var26; // L: 1211 + var4 += var27; // L: 1212 + var7 += var31; // L: 1213 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1214 + var32 += var34; // L: 1215 + var35 += var37; // L: 1216 + var38 += var40; // L: 1217 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 1259 + if (var1 < 0) { // L: 1260 + var5 -= var26 * var1; // L: 1261 + var4 -= var27 * var1; // L: 1262 + var7 -= var31 * var1; // L: 1263 + var1 = 0; // L: 1264 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 1266 + if (var0 < 0) { // L: 1267 + var3 -= var0 * var28; // L: 1268 + var0 = 0; // L: 1269 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 1271 + var32 += var34 * var41; // L: 1272 + var35 += var37 * var41; // L: 1273 + var38 += var40 * var41; // L: 1274 + if (var26 < var27) { // L: 1275 + var2 -= var0; // L: 1276 + var0 -= var1; // L: 1277 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1278 while (true) { - --var0; + --var0; // L: 1279 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1289 if (var2 < 0) { - return; + return; // L: 1299 } - 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, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1290 + var3 += var28; // L: 1291 + var4 += var27; // L: 1292 + var7 += var31; // L: 1293 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1294 + var32 += var34; // L: 1295 + var35 += var37; // L: 1296 + var38 += var40; // L: 1297 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1280 + var5 += var26; // L: 1281 + var4 += var27; // L: 1282 + var7 += var31; // L: 1283 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1284 + var32 += var34; // L: 1285 + var35 += var37; // L: 1286 + var38 += var40; // L: 1287 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 1302 + var0 -= var1; // L: 1303 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1304 while (true) { - --var0; + --var0; // L: 1305 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1315 if (var2 < 0) { - return; + return; // L: 1325 } - 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, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1316 + var3 += var28; // L: 1317 + var4 += var27; // L: 1318 + var7 += var31; // L: 1319 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1320 + var32 += var34; // L: 1321 + var35 += var37; // L: 1322 + var38 += var40; // L: 1323 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1306 + var5 += var26; // L: 1307 + var4 += var27; // L: 1308 + var7 += var31; // L: 1309 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1310 + var32 += var34; // L: 1311 + var35 += var37; // L: 1312 + var38 += var40; // L: 1313 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 1330 + if (var0 > Rasterizer3D_clipHeight) { // L: 1331 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 1332 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var8 = (var8 << 9) - var5 * var30 + var30; // L: 1333 + if (var0 < var1) { // L: 1334 + var4 = var5 <<= 14; // L: 1335 + if (var2 < 0) { // L: 1336 + var4 -= var27 * var2; // L: 1337 + var5 -= var28 * var2; // L: 1338 + var8 -= var31 * var2; // L: 1339 + var2 = 0; // L: 1340 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 1342 + if (var0 < 0) { // L: 1343 + var3 -= var0 * var26; // L: 1344 + var0 = 0; // L: 1345 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 1347 + var32 += var34 * var41; // L: 1348 + var35 += var37 * var41; // L: 1349 + var38 += var40 * var41; // L: 1350 + if (var27 < var28) { // L: 1351 + var1 -= var0; // L: 1352 + var0 -= var2; // L: 1353 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1354 while (true) { - --var0; + --var0; // L: 1355 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1365 if (var1 < 0) { - return; + return; // L: 1375 } - 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, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1366 + var4 += var27; // L: 1367 + var3 += var26; // L: 1368 + var8 += var31; // L: 1369 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1370 + var32 += var34; // L: 1371 + var35 += var37; // L: 1372 + var38 += var40; // L: 1373 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1356 + var4 += var27; // L: 1357 + var5 += var28; // L: 1358 + var8 += var31; // L: 1359 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1360 + var32 += var34; // L: 1361 + var35 += var37; // L: 1362 + var38 += var40; // L: 1363 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 1378 + var0 -= var2; // L: 1379 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1380 while (true) { - --var0; + --var0; // L: 1381 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1391 if (var1 < 0) { - return; + return; // L: 1401 } - 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, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1392 + var4 += var27; // L: 1393 + var3 += var26; // L: 1394 + var8 += var31; // L: 1395 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1396 + var32 += var34; // L: 1397 + var35 += var37; // L: 1398 + var38 += var40; // L: 1399 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1382 + var4 += var27; // L: 1383 + var5 += var28; // L: 1384 + var8 += var31; // L: 1385 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1386 + var32 += var34; // L: 1387 + var35 += var37; // L: 1388 + var38 += var40; // L: 1389 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 1405 + if (var2 < 0) { // L: 1406 + var3 -= var27 * var2; // L: 1407 + var5 -= var28 * var2; // L: 1408 + var8 -= var31 * var2; // L: 1409 + var2 = 0; // L: 1410 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 1412 + if (var1 < 0) { // L: 1413 + var4 -= var26 * var1; // L: 1414 + var1 = 0; // L: 1415 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 1417 + var32 += var34 * var41; // L: 1418 + var35 += var37 * var41; // L: 1419 + var38 += var40 * var41; // L: 1420 + if (var27 < var28) { // L: 1421 + var0 -= var1; // L: 1422 + var1 -= var2; // L: 1423 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1424 while (true) { - --var1; + --var1; // L: 1425 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1435 if (var0 < 0) { - return; + return; // L: 1445 } - 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, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1436 + var4 += var26; // L: 1437 + var5 += var28; // L: 1438 + var8 += var31; // L: 1439 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1440 + var32 += var34; // L: 1441 + var35 += var37; // L: 1442 + var38 += var40; // L: 1443 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1426 + var3 += var27; // L: 1427 + var5 += var28; // L: 1428 + var8 += var31; // L: 1429 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1430 + var32 += var34; // L: 1431 + var35 += var37; // L: 1432 + var38 += var40; // L: 1433 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 1448 + var1 -= var2; // L: 1449 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1450 while (true) { - --var1; + --var1; // L: 1451 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1461 if (var0 < 0) { - return; + return; // L: 1471 } - 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, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1462 + var4 += var26; // L: 1463 + var5 += var28; // L: 1464 + var8 += var31; // L: 1465 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1466 + var32 += var34; // L: 1467 + var35 += var37; // L: 1468 + var38 += var40; // L: 1469 } } - 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; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1452 + var3 += var27; // L: 1453 + var5 += var28; // L: 1454 + var8 += var31; // L: 1455 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1456 + var32 += var34; // L: 1457 + var35 += var37; // L: 1458 + var38 += var40; // L: 1459 } } } } } } - } + } // L: 1002 - @ObfuscatedName("s") + @ObfuscatedName("l") @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 (field2347) { - if (var6 > Rasterizer3D_clipWidth) { + if (field2365) { // L: 1480 + if (var6 > Rasterizer3D_clipWidth) { // L: 1481 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 1482 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 1484 + var4 += var5; // L: 1485 + var7 += var5 * var8; // L: 1486 + int var17 = var6 - var5; // L: 1487 int var15; int var16; int var10000; @@ -2068,1040 +2085,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - 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) { + if (Rasterizer3D_isLowDetailTexture) { // L: 1488 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1494 + var9 += var23 * (var12 >> 3); // L: 1495 + var10 += (var13 >> 3) * var23; // L: 1496 + var11 += var23 * (var14 >> 3); // L: 1497 + var22 = var11 >> 12; // L: 1498 + if (var22 != 0) { // L: 1499 + var18 = var9 / var22; // L: 1500 + var19 = var10 / var22; // L: 1501 + if (var18 < 0) { // L: 1502 var18 = 0; - } else if (var18 > 4032) { + } else if (var18 > 4032) { // L: 1503 var18 = 4032; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1506 + var19 = 0; // L: 1507 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1509 + var10 += var13; // L: 1510 + var11 += var14; // L: 1511 + var22 = var11 >> 12; // L: 1512 + if (var22 != 0) { // L: 1513 + var20 = var9 / var22; // L: 1514 + var21 = var10 / var22; // L: 1515 + if (var20 < 0) { // L: 1516 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1517 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1520 + var21 = 0; // L: 1521 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2346) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 1523 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1524 + var17 >>= 3; // L: 1525 + var8 <<= 3; // L: 1526 + var15 = var7 >> 8; // L: 1527 + if (field2344) { // L: 1528 + if (var17 > 0) { // L: 1529 do { - 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) { + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1531 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1532 + var2 += var16; // L: 1533 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1534 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1535 + var2 += var16; // L: 1536 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1537 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1538 + var2 += var16; // L: 1539 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1540 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1541 + var2 += var16; // L: 1542 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1543 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1544 + var2 += var16; // L: 1545 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1546 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1547 + var2 += var16; // L: 1548 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1549 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1550 + var2 += var16; // L: 1551 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1552 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1553 + var10000 = var16 + var2; // L: 1554 + var18 = var20; // L: 1555 + var19 = var21; // L: 1556 + var9 += var12; // L: 1557 + var10 += var13; // L: 1558 + var11 += var14; // L: 1559 + var22 = var11 >> 12; // L: 1560 + if (var22 != 0) { // L: 1561 + var20 = var9 / var22; // L: 1562 + var21 = var10 / var22; // L: 1563 + if (var20 < 0) { // L: 1564 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1565 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1568 + var21 = 0; // L: 1569 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1571 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1572 + var7 += var8; // L: 1573 + var15 = var7 >> 8; // L: 1574 + --var17; // L: 1575 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1577 + if (var17 > 0) { // L: 1578 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1580 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581 + var2 += var16; // L: 1582 + --var17; // L: 1583 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1587 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1589 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1590 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1592 + var2 += var16; // L: 1593 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1594 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1595 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1597 + var2 += var16; // L: 1598 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1599 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1600 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1602 + var2 += var16; // L: 1603 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1604 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1605 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1607 + var2 += var16; // L: 1608 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1609 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1610 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1612 + var2 += var16; // L: 1613 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1614 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1615 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1617 + var2 += var16; // L: 1618 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1619 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1620 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1622 + var2 += var16; // L: 1623 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1624 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // 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) { + ++var4; // L: 1627 + var10000 = var16 + var2; // L: 1628 + var18 = var20; // L: 1629 + var19 = var21; // L: 1630 + var9 += var12; // L: 1631 + var10 += var13; // L: 1632 + var11 += var14; // L: 1633 + var22 = var11 >> 12; // L: 1634 + if (var22 != 0) { // L: 1635 + var20 = var9 / var22; // L: 1636 + var21 = var10 / var22; // L: 1637 + if (var20 < 0) { // L: 1638 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1639 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1642 + var21 = 0; // L: 1643 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1645 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1646 + var7 += var8; // L: 1647 + var15 = var7 >> 8; // L: 1648 + --var17; // L: 1649 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1651 + if (var17 > 0) { // L: 1652 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1654 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1655 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1657 + var2 += var16; // L: 1658 + --var17; // L: 1659 } while(var17 > 0); } } } else { - 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) { + var23 = var5 - Rasterizer3D_clipMidX; // L: 1669 + var9 += var23 * (var12 >> 3); // L: 1670 + var10 += (var13 >> 3) * var23; // L: 1671 + var11 += var23 * (var14 >> 3); // L: 1672 + var22 = var11 >> 14; // L: 1673 + if (var22 != 0) { // L: 1674 + var18 = var9 / var22; // L: 1675 + var19 = var10 / var22; // L: 1676 + if (var18 < 0) { // L: 1677 var18 = 0; - } else if (var18 > 16256) { + } else if (var18 > 16256) { // L: 1678 var18 = 16256; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1681 + var19 = 0; // L: 1682 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1684 + var10 += var13; // L: 1685 + var11 += var14; // L: 1686 + var22 = var11 >> 14; // L: 1687 + if (var22 != 0) { // L: 1688 + var20 = var9 / var22; // L: 1689 + var21 = var10 / var22; // L: 1690 + if (var20 < 0) { // L: 1691 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1692 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1695 + var21 = 0; // L: 1696 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2346) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 1698 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1699 + var17 >>= 3; // L: 1700 + var8 <<= 3; // L: 1701 + var15 = var7 >> 8; // L: 1702 + if (field2344) { // L: 1703 + if (var17 > 0) { // L: 1704 do { - 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) { + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1706 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1707 + var2 += var16; // L: 1708 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1709 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1710 + var2 += var16; // L: 1711 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1712 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1713 + var2 += var16; // L: 1714 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1715 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1716 + var2 += var16; // L: 1717 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1718 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1719 + var2 += var16; // L: 1720 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1721 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1722 + var2 += var16; // L: 1723 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1724 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1725 + var2 += var16; // L: 1726 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1727 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1728 + var10000 = var16 + var2; // L: 1729 + var18 = var20; // L: 1730 + var19 = var21; // L: 1731 + var9 += var12; // L: 1732 + var10 += var13; // L: 1733 + var11 += var14; // L: 1734 + var22 = var11 >> 14; // L: 1735 + if (var22 != 0) { // L: 1736 + var20 = var9 / var22; // L: 1737 + var21 = var10 / var22; // L: 1738 + if (var20 < 0) { // L: 1739 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1740 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1743 + var21 = 0; // L: 1744 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1746 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1747 + var7 += var8; // L: 1748 + var15 = var7 >> 8; // L: 1749 + --var17; // L: 1750 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1752 + if (var17 > 0) { // L: 1753 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1755 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756 + var2 += var16; // L: 1757 + --var17; // L: 1758 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1762 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1764 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1765 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1767 + var2 += var16; // L: 1768 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1769 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1770 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1772 + var2 += var16; // L: 1773 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1774 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1775 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1777 + var2 += var16; // L: 1778 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1779 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1780 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1782 + var2 += var16; // L: 1783 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1784 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1785 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1787 + var2 += var16; // L: 1788 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1789 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1790 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1792 + var2 += var16; // L: 1793 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1794 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1795 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1797 + var2 += var16; // L: 1798 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1799 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // 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) { + ++var4; // L: 1802 + var10000 = var16 + var2; // L: 1803 + var18 = var20; // L: 1804 + var19 = var21; // L: 1805 + var9 += var12; // L: 1806 + var10 += var13; // L: 1807 + var11 += var14; // L: 1808 + var22 = var11 >> 14; // L: 1809 + if (var22 != 0) { // L: 1810 + var20 = var9 / var22; // L: 1811 + var21 = var10 / var22; // L: 1812 + if (var20 < 0) { // L: 1813 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1814 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1817 + var21 = 0; // L: 1818 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1820 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1821 + var7 += var8; // L: 1822 + var15 = var7 >> 8; // L: 1823 + --var17; // L: 1824 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1826 + if (var17 > 0) { // L: 1827 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1829 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1830 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1832 + var2 += var16; // L: 1833 + --var17; // L: 1834 } while(var17 > 0); } } } } - } + } // L: 1838 - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1841 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method4128(var0, var1, var2, var3, var4, var5, method4145(var20, var6), method4145(var20, var7), method4145(var20, var8)); + if (var19 == null) { // L: 1842 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1843 + method4211(var0, var1, var2, var3, var4, var5, method4246(var20, var6), method4246(var20, var7), method4246(var20, var8)); // L: 1844 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2346 = Rasterizer3D_textureLoader.vmethod4565(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) { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1847 + field2344 = Rasterizer3D_textureLoader.vmethod4636(var18); // L: 1848 + var20 = var4 - var3; // L: 1849 + int var21 = var1 - var0; // L: 1850 + int var22 = var5 - var3; // L: 1851 + int var23 = var2 - var0; // L: 1852 + int var24 = var7 - var6; // L: 1853 + int var25 = var8 - var6; // L: 1854 + int var26 = 0; // L: 1855 + if (var0 != var1) { // L: 1856 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 1857 + if (var2 != var1) { // L: 1858 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 1859 + if (var0 != var2) { // L: 1860 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; - if (var29 != 0) { - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); - int var35 = var10 * var12 - var13 * var9 << 14; - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); - int var38 = var13 * var11 - var10 * var14 << 14; - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); + int var29 = var20 * var23 - var22 * var21; // L: 1861 + if (var29 != 0) { // L: 1862 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1863 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1864 + var10 = var9 - var10; // L: 1865 + var13 = var12 - var13; // L: 1866 + var16 = var15 - var16; // L: 1867 + var11 -= var9; // L: 1868 + var14 -= var12; // L: 1869 + var17 -= var15; // L: 1870 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1871 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1872 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1873 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1874 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1875 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1876 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1877 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1878 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1879 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1880 + if (var0 < Rasterizer3D_clipHeight) { // L: 1881 + if (var1 > Rasterizer3D_clipHeight) { // L: 1882 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1883 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1884 + if (var1 < var2) { // L: 1885 + var5 = var3 <<= 14; // L: 1886 + if (var0 < 0) { // L: 1887 + var5 -= var0 * var28; // L: 1888 + var3 -= var0 * var26; // L: 1889 + var6 -= var0 * var31; // L: 1890 + var0 = 0; // L: 1891 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1893 + if (var1 < 0) { // L: 1894 + var4 -= var27 * var1; // L: 1895 + var1 = 0; // L: 1896 } - 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]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1898 + var32 += var34 * var41; // L: 1899 + var35 += var37 * var41; // L: 1900 + var38 += var40 * var41; // L: 1901 + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1902 + var2 -= var1; // L: 1903 + var1 -= var0; // L: 1904 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1905 while (true) { - --var1; + --var1; // L: 1906 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1916 if (var2 < 0) { - return; + return; // L: 1926 } - 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, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1917 + var5 += var28; // L: 1918 + var4 += var27; // L: 1919 + var6 += var31; // L: 1920 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1921 + var32 += var34; // L: 1922 + var35 += var37; // L: 1923 + var38 += var40; // L: 1924 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1907 + var5 += var28; // L: 1908 + var3 += var26; // L: 1909 + var6 += var31; // L: 1910 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1911 + var32 += var34; // L: 1912 + var35 += var37; // L: 1913 + var38 += var40; // L: 1914 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1929 + var1 -= var0; // L: 1930 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1931 while (true) { - --var1; + --var1; // L: 1932 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1942 if (var2 < 0) { - return; + return; // L: 1952 } - 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, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1943 + var5 += var28; // L: 1944 + var4 += var27; // L: 1945 + var6 += var31; // L: 1946 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1947 + var32 += var34; // L: 1948 + var35 += var37; // L: 1949 + var38 += var40; // L: 1950 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1933 + var5 += var28; // L: 1934 + var3 += var26; // L: 1935 + var6 += var31; // L: 1936 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1937 + var32 += var34; // L: 1938 + var35 += var37; // L: 1939 + var38 += var40; // L: 1940 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1956 + if (var0 < 0) { // L: 1957 + var4 -= var0 * var28; // L: 1958 + var3 -= var0 * var26; // L: 1959 + var6 -= var0 * var31; // L: 1960 + var0 = 0; // L: 1961 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 1963 + if (var2 < 0) { // L: 1964 + var5 -= var27 * var2; // L: 1965 + var2 = 0; // L: 1966 } - 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]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1968 + var32 += var34 * var41; // L: 1969 + var35 += var37 * var41; // L: 1970 + var38 += var40 * var41; // L: 1971 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1972 + var1 -= var2; // L: 1973 + var2 -= var0; // L: 1974 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1975 while (true) { - --var2; + --var2; // L: 1976 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1986 if (var1 < 0) { - return; + return; // L: 1996 } - 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1987 + var5 += var27; // L: 1988 + var3 += var26; // L: 1989 + var6 += var31; // L: 1990 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1991 + var32 += var34; // L: 1992 + var35 += var37; // L: 1993 + var38 += var40; // L: 1994 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1977 + var4 += var28; // L: 1978 + var3 += var26; // L: 1979 + var6 += var31; // L: 1980 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1981 + var32 += var34; // L: 1982 + var35 += var37; // L: 1983 + var38 += var40; // L: 1984 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 1999 + var2 -= var0; // L: 2000 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 2001 while (true) { - --var2; + --var2; // L: 2002 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 2012 if (var1 < 0) { - return; + return; // L: 2022 } - 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, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2013 + var5 += var27; // L: 2014 + var3 += var26; // L: 2015 + var6 += var31; // L: 2016 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2017 + var32 += var34; // L: 2018 + var35 += var37; // L: 2019 + var38 += var40; // L: 2020 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2003 + var4 += var28; // L: 2004 + var3 += var26; // L: 2005 + var6 += var31; // L: 2006 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2007 + var32 += var34; // L: 2008 + var35 += var37; // L: 2009 + var38 += var40; // L: 2010 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 2026 + if (var1 < Rasterizer3D_clipHeight) { // L: 2027 + if (var2 > Rasterizer3D_clipHeight) { // L: 2028 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 2029 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2030 + if (var2 < var0) { // L: 2031 + var3 = var4 <<= 14; // L: 2032 + if (var1 < 0) { // L: 2033 + var3 -= var26 * var1; // L: 2034 + var4 -= var27 * var1; // L: 2035 + var7 -= var31 * var1; // L: 2036 + var1 = 0; // L: 2037 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 2039 + if (var2 < 0) { // L: 2040 + var5 -= var28 * var2; // L: 2041 + var2 = 0; // L: 2042 } - 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]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 2044 + var32 += var34 * var41; // L: 2045 + var35 += var37 * var41; // L: 2046 + var38 += var40 * var41; // L: 2047 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2048 + var0 -= var2; // L: 2075 + var2 -= var1; // L: 2076 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2077 while (true) { - --var2; + --var2; // L: 2078 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2088 if (var0 < 0) { - return; + return; // L: 2098 } - 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, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2089 + var3 += var26; // L: 2090 + var5 += var28; // L: 2091 + var7 += var31; // L: 2092 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2093 + var32 += var34; // L: 2094 + var35 += var37; // L: 2095 + var38 += var40; // L: 2096 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2079 + var3 += var26; // L: 2080 + var4 += var27; // L: 2081 + var7 += var31; // L: 2082 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2083 + var32 += var34; // L: 2084 + var35 += var37; // L: 2085 + var38 += var40; // L: 2086 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 2049 + var2 -= var1; // L: 2050 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2051 while (true) { - --var2; + --var2; // L: 2052 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2062 if (var0 < 0) { - return; + return; // L: 2072 } - 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, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2063 + var3 += var26; // L: 2064 + var5 += var28; // L: 2065 + var7 += var31; // L: 2066 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2067 + var32 += var34; // L: 2068 + var35 += var37; // L: 2069 + var38 += var40; // L: 2070 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2053 + var3 += var26; // L: 2054 + var4 += var27; // L: 2055 + var7 += var31; // L: 2056 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2057 + var32 += var34; // L: 2058 + var35 += var37; // L: 2059 + var38 += var40; // L: 2060 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 2102 + if (var1 < 0) { // L: 2103 + var5 -= var26 * var1; // L: 2104 + var4 -= var27 * var1; // L: 2105 + var7 -= var31 * var1; // L: 2106 + var1 = 0; // L: 2107 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 2109 + if (var0 < 0) { // L: 2110 + var3 -= var0 * var28; // L: 2111 + var0 = 0; // L: 2112 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 2114 + var32 += var34 * var41; // L: 2115 + var35 += var37 * var41; // L: 2116 + var38 += var40 * var41; // L: 2117 + if (var26 < var27) { // L: 2118 + var2 -= var0; // L: 2119 + var0 -= var1; // L: 2120 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2121 while (true) { - --var0; + --var0; // L: 2122 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2132 if (var2 < 0) { - return; + return; // L: 2142 } - 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, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2133 + var3 += var28; // L: 2134 + var4 += var27; // L: 2135 + var7 += var31; // L: 2136 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2137 + var32 += var34; // L: 2138 + var35 += var37; // L: 2139 + var38 += var40; // L: 2140 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2123 + var5 += var26; // L: 2124 + var4 += var27; // L: 2125 + var7 += var31; // L: 2126 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2127 + var32 += var34; // L: 2128 + var35 += var37; // L: 2129 + var38 += var40; // L: 2130 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 2145 + var0 -= var1; // L: 2146 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2147 while (true) { - --var0; + --var0; // L: 2148 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2158 if (var2 < 0) { - return; + return; // L: 2168 } - 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, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2159 + var3 += var28; // L: 2160 + var4 += var27; // L: 2161 + var7 += var31; // L: 2162 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2163 + var32 += var34; // L: 2164 + var35 += var37; // L: 2165 + var38 += var40; // L: 2166 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2149 + var5 += var26; // L: 2150 + var4 += var27; // L: 2151 + var7 += var31; // L: 2152 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2153 + var32 += var34; // L: 2154 + var35 += var37; // L: 2155 + var38 += var40; // L: 2156 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 2173 + if (var0 > Rasterizer3D_clipHeight) { // L: 2174 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 2175 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var8 = (var8 << 9) - var5 * var30 + var30; // L: 2176 + if (var0 < var1) { // L: 2177 + var4 = var5 <<= 14; // L: 2178 + if (var2 < 0) { // L: 2179 + var4 -= var27 * var2; // L: 2180 + var5 -= var28 * var2; // L: 2181 + var8 -= var31 * var2; // L: 2182 + var2 = 0; // L: 2183 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 2185 + if (var0 < 0) { // L: 2186 + var3 -= var0 * var26; // L: 2187 + var0 = 0; // L: 2188 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 2190 + var32 += var34 * var41; // L: 2191 + var35 += var37 * var41; // L: 2192 + var38 += var40 * var41; // L: 2193 + if (var27 < var28) { // L: 2194 + var1 -= var0; // L: 2195 + var0 -= var2; // L: 2196 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2197 while (true) { - --var0; + --var0; // L: 2198 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2208 if (var1 < 0) { - return; + return; // L: 2218 } - 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, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2209 + var4 += var27; // L: 2210 + var3 += var26; // L: 2211 + var8 += var31; // L: 2212 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2213 + var32 += var34; // L: 2214 + var35 += var37; // L: 2215 + var38 += var40; // L: 2216 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2199 + var4 += var27; // L: 2200 + var5 += var28; // L: 2201 + var8 += var31; // L: 2202 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2203 + var32 += var34; // L: 2204 + var35 += var37; // L: 2205 + var38 += var40; // L: 2206 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 2221 + var0 -= var2; // L: 2222 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2223 while (true) { - --var0; + --var0; // L: 2224 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2234 if (var1 < 0) { - return; + return; // L: 2244 } - 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, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2235 + var4 += var27; // L: 2236 + var3 += var26; // L: 2237 + var8 += var31; // L: 2238 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2239 + var32 += var34; // L: 2240 + var35 += var37; // L: 2241 + var38 += var40; // L: 2242 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2225 + var4 += var27; // L: 2226 + var5 += var28; // L: 2227 + var8 += var31; // L: 2228 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2229 + var32 += var34; // L: 2230 + var35 += var37; // L: 2231 + var38 += var40; // L: 2232 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 2248 + if (var2 < 0) { // L: 2249 + var3 -= var27 * var2; // L: 2250 + var5 -= var28 * var2; // L: 2251 + var8 -= var31 * var2; // L: 2252 + var2 = 0; // L: 2253 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 2255 + if (var1 < 0) { // L: 2256 + var4 -= var26 * var1; // L: 2257 + var1 = 0; // L: 2258 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 2260 + var32 += var34 * var41; // L: 2261 + var35 += var37 * var41; // L: 2262 + var38 += var40 * var41; // L: 2263 + if (var27 < var28) { // L: 2264 + var0 -= var1; // L: 2265 + var1 -= var2; // L: 2266 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2267 while (true) { - --var1; + --var1; // L: 2268 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2278 if (var0 < 0) { - return; + return; // L: 2288 } - 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, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2279 + var4 += var26; // L: 2280 + var5 += var28; // L: 2281 + var8 += var31; // L: 2282 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2283 + var32 += var34; // L: 2284 + var35 += var37; // L: 2285 + var38 += var40; // L: 2286 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2269 + var3 += var27; // L: 2270 + var5 += var28; // L: 2271 + var8 += var31; // L: 2272 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2273 + var32 += var34; // L: 2274 + var35 += var37; // L: 2275 + var38 += var40; // L: 2276 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 2291 + var1 -= var2; // L: 2292 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2293 while (true) { - --var1; + --var1; // L: 2294 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2304 if (var0 < 0) { - return; + return; // L: 2314 } - 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, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2305 + var4 += var26; // L: 2306 + var5 += var28; // L: 2307 + var8 += var31; // L: 2308 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2309 + var32 += var34; // L: 2310 + var35 += var37; // L: 2311 + var38 += var40; // L: 2312 } } - 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2295 + var3 += var27; // L: 2296 + var5 += var28; // L: 2297 + var8 += var31; // L: 2298 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2299 + var32 += var34; // L: 2300 + var35 += var37; // L: 2301 + var38 += var40; // L: 2302 } } } } } } - } + } // L: 1845 - @ObfuscatedName("b") + @ObfuscatedName("n") @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 (field2347) { - if (var6 > Rasterizer3D_clipWidth) { + if (field2365) { // L: 2323 + if (var6 > Rasterizer3D_clipWidth) { // L: 2324 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 2325 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 2327 + var4 += var5; // L: 2328 + var7 += var5 * var8; // L: 2329 + int var17 = var6 - var5; // L: 2330 int var15; int var16; int var18; @@ -3110,336 +3127,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - 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; + if (Rasterizer3D_isLowDetailTexture) { // L: 2331 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2338 + var9 += var23 * var12; // L: 2339 + var10 += var13 * var23; // L: 2340 + var11 += var23 * var14; // L: 2341 + var22 = var11 >> 12; // L: 2342 + if (var22 != 0) { // L: 2343 + var18 = var9 / var22; // L: 2344 + var19 = var10 / var22; // L: 2345 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2348 + var19 = 0; // L: 2349 } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; + var9 += var17 * var12; // L: 2351 + var10 += var13 * var17; // L: 2352 + var11 += var17 * var14; // L: 2353 + var22 = var11 >> 12; // L: 2354 + if (var22 != 0) { // L: 2355 + var20 = var9 / var22; // L: 2356 + var21 = var10 / var22; // L: 2357 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2360 + var21 = 0; // L: 2361 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2346) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 2363 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2364 + var17 >>= 3; // L: 2365 + var8 <<= 3; // L: 2366 + var15 = var7 >> 8; // L: 2367 + if (field2344) { // L: 2369 + if (var17 > 0) { // L: 2370 do { - 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; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2372 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2373 + var2 += var16; // L: 2374 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2375 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2376 + var2 += var16; // L: 2377 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2378 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2379 + var2 += var16; // L: 2380 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2381 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2382 + var2 += var16; // L: 2383 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2384 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2385 + var2 += var16; // L: 2386 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2387 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2388 + var2 += var16; // L: 2389 + 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 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2393 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394 + var2 += var16; // L: 2395 + var7 += var8; // L: 2396 + var15 = var7 >> 8; // L: 2397 + --var17; // L: 2398 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2400 + if (var17 > 0) { // L: 2401 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2403 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2404 + var2 += var16; // L: 2405 + --var17; // L: 2406 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2410 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2412 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2413 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2415 + var2 += var16; // L: 2416 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2417 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2418 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2420 + var2 += var16; // L: 2421 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2422 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2423 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2425 + var2 += var16; // L: 2426 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2427 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2428 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2430 + var2 += var16; // L: 2431 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2432 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2433 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2435 + var2 += var16; // L: 2436 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2437 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2438 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2440 + var2 += var16; // L: 2441 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2442 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2443 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2445 + var2 += var16; // L: 2446 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2447 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2448 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2450 + var2 += var16; // L: 2451 + var7 += var8; // L: 2452 + var15 = var7 >> 8; // L: 2453 + --var17; // L: 2454 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2456 + if (var17 > 0) { // L: 2457 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2459 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2460 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2462 + var2 += var16; // L: 2463 + --var17; // L: 2464 } while(var17 > 0); } } } else { - 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; + var23 = var5 - Rasterizer3D_clipMidX; // L: 2475 + var9 += var23 * var12; // L: 2476 + var10 += var13 * var23; // L: 2477 + var11 += var23 * var14; // L: 2478 + var22 = var11 >> 14; // L: 2479 + if (var22 != 0) { // L: 2480 + var18 = var9 / var22; // L: 2481 + var19 = var10 / var22; // L: 2482 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2485 + var19 = 0; // L: 2486 } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; + var9 += var17 * var12; // L: 2488 + var10 += var13 * var17; // L: 2489 + var11 += var17 * var14; // L: 2490 + var22 = var11 >> 14; // L: 2491 + if (var22 != 0) { // L: 2492 + var20 = var9 / var22; // L: 2493 + var21 = var10 / var22; // L: 2494 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2497 + var21 = 0; // L: 2498 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2346) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 2500 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2501 + var17 >>= 3; // L: 2502 + var8 <<= 3; // L: 2503 + var15 = var7 >> 8; // L: 2504 + if (field2344) { // L: 2506 + if (var17 > 0) { // L: 2507 do { - 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; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2509 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2510 + var2 += var16; // L: 2511 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2512 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2513 + var2 += var16; // L: 2514 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2515 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2516 + var2 += var16; // L: 2517 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2518 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2519 + var2 += var16; // L: 2520 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2521 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2522 + var2 += var16; // L: 2523 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2524 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2525 + var2 += var16; // L: 2526 + 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 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2530 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531 + var2 += var16; // L: 2532 + var7 += var8; // L: 2533 + var15 = var7 >> 8; // L: 2534 + --var17; // L: 2535 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2537 + if (var17 > 0) { // L: 2538 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2540 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2541 + var2 += var16; // L: 2542 + --var17; // L: 2543 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2547 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2549 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2550 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2552 + var2 += var16; // L: 2553 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2554 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2555 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2557 + var2 += var16; // L: 2558 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2559 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2560 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2562 + var2 += var16; // L: 2563 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2564 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2565 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2567 + var2 += var16; // L: 2568 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2569 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2570 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2572 + var2 += var16; // L: 2573 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2574 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2575 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2577 + var2 += var16; // L: 2578 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2579 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2580 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2582 + var2 += var16; // L: 2583 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2584 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2585 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2587 + var2 += var16; // L: 2588 + var7 += var8; // L: 2589 + var15 = var7 >> 8; // L: 2590 + --var17; // L: 2591 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2593 + if (var17 > 0) { // L: 2594 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2596 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2597 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2599 + var2 += var16; // L: 2600 + --var17; // L: 2601 } while(var17 > 0); } } } } - } + } // L: 2605 - @ObfuscatedName("x") - static final int method4145(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("z") + static final int method4246(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 2608 + if (var1 < 2) { // L: 2609 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 2610 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 2611 } - @ObfuscatedName("p") - static final int method4137(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + @ObfuscatedName("q") + static final int method4220(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2615 } - @ObfuscatedName("z") - static final int method4138(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("h") - static final int method4139(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - - @ObfuscatedName("o") - static final int method4125(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; + @ObfuscatedName("d") + static final int method4243(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2619 } @ObfuscatedName("r") - static final int method4141(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + static final int method4222(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; // L: 2623 } - @ObfuscatedName("n") - static final int method4183(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; + @ObfuscatedName("m") + static final int method4223(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; // L: 2627 + } + + @ObfuscatedName("c") + static final int method4224(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2631 + } + + @ObfuscatedName("f") + static final int method4225(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2635 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 16c802b973..05059c7bce 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,1567 +3,1567 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("ax") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("l") - int field332; - @ObfuscatedName("q") - int field326; - @ObfuscatedName("f") - int field321; - @ObfuscatedName("j") - int field322; - @ObfuscatedName("m") - int field323; - @ObfuscatedName("k") - int field324; - @ObfuscatedName("t") - int field325; + @ObfuscatedName("i") + int field318; + @ObfuscatedName("s") + int field309; @ObfuscatedName("a") + int field307; + @ObfuscatedName("o") + int field308; + @ObfuscatedName("g") + int field311; + @ObfuscatedName("e") + int field310; + @ObfuscatedName("p") + int field305; + @ObfuscatedName("j") @Export("numLoops") int numLoops; - @ObfuscatedName("e") + @ObfuscatedName("b") @Export("start") int start; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("end") int end; @ObfuscatedName("y") - boolean field329; - @ObfuscatedName("g") - int field320; - @ObfuscatedName("v") - int field331; - @ObfuscatedName("s") - int field330; - @ObfuscatedName("c") + boolean field315; + @ObfuscatedName("k") + int field316; + @ObfuscatedName("t") + int field317; + @ObfuscatedName("l") + int field306; + @ObfuscatedName("u") int field319; @ObfuscatedSignature( - descriptor = "(Laa;III)V" + descriptor = "(Laz;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field329 = var1.field249; - this.field326 = var2; - this.field321 = var3; - this.field322 = var4; - this.field332 = 0; - this.method795(); - } + super.sound = var1; // L: 51 + this.start = var1.start; // L: 52 + this.end = var1.end; // L: 53 + this.field315 = var1.field238; // L: 54 + this.field309 = var2; // L: 55 + this.field307 = var3; // L: 56 + this.field308 = var4; // L: 57 + this.field318 = 0; // L: 58 + this.method818(); // L: 59 + } // L: 60 @ObfuscatedSignature( - descriptor = "(Laa;II)V" + descriptor = "(Laz;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field329 = var1.field249; - this.field326 = var2; - this.field321 = var3; - this.field322 = 8192; - this.field332 = 0; - this.method795(); - } + super.sound = var1; // L: 39 + this.start = var1.start; // L: 40 + this.end = var1.end; // L: 41 + this.field315 = var1.field238; // L: 42 + this.field309 = var2; // L: 43 + this.field307 = var3; // L: 44 + this.field308 = 8192; // L: 45 + this.field318 = 0; // L: 46 + this.method818(); // L: 47 + } // L: 48 - @ObfuscatedName("m") - void method795() { - this.field323 = this.field321; - this.field324 = method865(this.field321, this.field322); - this.field325 = method790(this.field321, this.field322); - } + @ObfuscatedName("o") + void method818() { + this.field311 = this.field307; // L: 73 + this.field310 = method826(this.field307, this.field308); // L: 74 + this.field305 = method968(this.field307, this.field308); // L: 75 + } // L: 76 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return null; + return null; // L: 200 } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "()Lav;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return null; + return null; // L: 204 } - @ObfuscatedName("a") - protected int vmethod4889() { - return this.field321 == 0 && this.field320 == 0 ? 0 : 1; + @ObfuscatedName("p") + protected int vmethod4958() { + return this.field307 == 0 && this.field316 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field321 == 0 && this.field320 == 0) { - this.skip(var3); + if (this.field307 == 0 && this.field316 == 0) { // L: 213 + this.skip(var3); // L: 214 } else { - 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) { + 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 this.numLoops = 0; } - int var9 = var2; - var3 += var2; - if (this.field332 < 0) { - if (this.field326 <= 0) { - this.method804(); - this.remove(); - return; + int var9 = var2; // L: 223 + var3 += var2; // L: 224 + if (this.field318 < 0) { // L: 225 + if (this.field309 <= 0) { // L: 226 + this.method915(); // L: 228 + this.remove(); // L: 229 + return; // L: 230 } - this.field332 = 0; + this.field318 = 0; } - if (this.field332 >= var7) { - if (this.field326 >= 0) { - this.method804(); - this.remove(); - return; + if (this.field318 >= var7) { // L: 233 + if (this.field309 >= 0) { // L: 234 + this.method915(); // L: 236 + this.remove(); // L: 237 + return; // L: 238 } - this.field332 = var7 - 1; + this.field318 = var7 - 1; } - if (this.numLoops < 0) { - if (this.field329) { - if (this.field326 < 0) { - var9 = this.method818(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field332 >= var5) { + if (this.numLoops < 0) { // L: 241 + if (this.field315) { // L: 242 + if (this.field309 < 0) { // L: 243 + var9 = this.method841(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field318 >= var5) { // L: 245 return; } - this.field332 = var5 + var5 - 1 - this.field332; - this.field326 = -this.field326; + this.field318 = var5 + var5 - 1 - this.field318; // L: 246 + this.field309 = -this.field309; // L: 247 } while (true) { - var9 = this.method885(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field332 < var6) { + var9 = this.method827(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field318 < var6) { // L: 251 return; } - this.field332 = var6 + var6 - 1 - this.field332; - this.field326 = -this.field326; - var9 = this.method818(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field332 >= var5) { + this.field318 = var6 + var6 - 1 - this.field318; // L: 252 + this.field309 = -this.field309; // L: 253 + var9 = this.method841(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field318 >= var5) { // L: 255 return; } - this.field332 = var5 + var5 - 1 - this.field332; - this.field326 = -this.field326; + this.field318 = var5 + var5 - 1 - this.field318; // L: 256 + this.field309 = -this.field309; // L: 257 } - } else if (this.field326 < 0) { + } else if (this.field309 < 0) { // L: 260 while (true) { - var9 = this.method818(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field332 >= var5) { + var9 = this.method841(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field318 >= var5) { // L: 263 return; } - this.field332 = var6 - 1 - (var6 - 1 - this.field332) % var8; + this.field318 = var6 - 1 - (var6 - 1 - this.field318) % var8; // L: 264 } } else { while (true) { - var9 = this.method885(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field332 < var6) { + var9 = this.method827(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field318 < var6) { // L: 270 return; } - this.field332 = var5 + (this.field332 - var5) % var8; + this.field318 = var5 + (this.field318 - var5) % var8; // L: 271 } } } else { - if (this.numLoops > 0) { - if (this.field329) { + if (this.numLoops > 0) { // L: 275 + if (this.field315) { // L: 276 label127: { - if (this.field326 < 0) { - var9 = this.method818(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field332 >= var5) { + if (this.field309 < 0) { // L: 277 + var9 = this.method841(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field318 >= var5) { // L: 279 return; } - this.field332 = var5 + var5 - 1 - this.field332; - this.field326 = -this.field326; - if (--this.numLoops == 0) { + this.field318 = var5 + var5 - 1 - this.field318; // L: 280 + this.field309 = -this.field309; // L: 281 + if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method885(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field332 < var6) { + var9 = this.method827(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field318 < var6) { // L: 286 return; } - this.field332 = var6 + var6 - 1 - this.field332; - this.field326 = -this.field326; - if (--this.numLoops == 0) { + this.field318 = var6 + var6 - 1 - this.field318; // L: 287 + this.field309 = -this.field309; // L: 288 + if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method818(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field332 >= var5) { + var9 = this.method841(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field318 >= var5) { // L: 291 return; } - this.field332 = var5 + var5 - 1 - this.field332; - this.field326 = -this.field326; - } while(--this.numLoops != 0); + this.field318 = var5 + var5 - 1 - this.field318; // L: 292 + this.field309 = -this.field309; // L: 293 + } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field326 < 0) { + if (this.field309 < 0) { // L: 297 while (true) { - var9 = this.method818(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field332 >= var5) { + var9 = this.method841(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field318 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field332) / var8; - if (var10 >= this.numLoops) { - this.field332 += var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (var6 - 1 - this.field318) / var8; // L: 301 + if (var10 >= this.numLoops) { // L: 302 + this.field318 += var8 * this.numLoops; // L: 303 + this.numLoops = 0; // L: 304 + break; // L: 305 } - this.field332 += var8 * var10; - this.numLoops -= var10; + this.field318 += var8 * var10; // L: 307 + this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method885(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field332 < var6) { + var9 = this.method827(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field318 < var6) { // L: 314 return; } - var10 = (this.field332 - var5) / var8; - if (var10 >= this.numLoops) { - this.field332 -= var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (this.field318 - var5) / var8; // L: 315 + if (var10 >= this.numLoops) { // L: 316 + this.field318 -= var8 * this.numLoops; // L: 317 + this.numLoops = 0; // L: 318 + break; // L: 319 } - this.field332 -= var8 * var10; - this.numLoops -= var10; + this.field318 -= var8 * var10; // L: 321 + this.numLoops -= var10; // L: 322 } } } } - if (this.field326 < 0) { - this.method818(var1, var9, 0, var3, 0); - if (this.field332 < 0) { - this.field332 = -1; - this.method804(); - this.remove(); + if (this.field309 < 0) { // L: 326 + this.method841(var1, var9, 0, var3, 0); // L: 327 + if (this.field318 < 0) { // L: 328 + this.field318 = -1; // L: 329 + this.method915(); // L: 330 + this.remove(); // L: 331 } } else { - this.method885(var1, var9, var7, var3, 0); - if (this.field332 >= var7) { - this.field332 = var7; - this.method804(); - this.remove(); + this.method827(var1, var9, var7, var3, 0); // L: 335 + if (this.field318 >= var7) { // L: 336 + this.field318 = var7; // L: 337 + this.method915(); // L: 338 + this.remove(); // L: 339 } } } } - } + } // L: 215 342 - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { - this.numLoops = var1; - } + this.numLoops = var1; // L: 79 + } // L: 80 - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("skip") public synchronized void skip(int var1) { - if (this.field320 > 0) { - if (var1 >= this.field320) { - if (this.field321 == Integer.MIN_VALUE) { - this.field321 = 0; - this.field325 = 0; - this.field324 = 0; - this.field323 = 0; - this.remove(); - var1 = this.field320; + if (this.field316 > 0) { // L: 345 + if (var1 >= this.field316) { // L: 346 + if (this.field307 == Integer.MIN_VALUE) { // L: 347 + this.field307 = 0; // L: 348 + this.field305 = 0; // L: 349 + this.field310 = 0; // L: 350 + this.field311 = 0; // L: 351 + this.remove(); // L: 352 + var1 = this.field316; // L: 353 } - this.field320 = 0; - this.method795(); + this.field316 = 0; // L: 355 + this.method818(); // L: 356 } else { - this.field323 += this.field331 * var1; - this.field324 += this.field330 * var1; - this.field325 += this.field319 * var1; - this.field320 -= var1; + this.field311 += this.field317 * var1; // L: 359 + this.field310 += this.field306 * var1; // L: 360 + this.field305 += this.field319 * var1; // L: 361 + this.field316 -= var1; // L: 362 } } - 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) { + 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 this.numLoops = 0; } - if (this.field332 < 0) { - if (this.field326 <= 0) { - this.method804(); - this.remove(); - return; + if (this.field318 < 0) { // L: 371 + if (this.field309 <= 0) { // L: 372 + this.method915(); // L: 374 + this.remove(); // L: 375 + return; // L: 376 } - this.field332 = 0; + this.field318 = 0; } - if (this.field332 >= var5) { - if (this.field326 >= 0) { - this.method804(); - this.remove(); - return; + if (this.field318 >= var5) { // L: 379 + if (this.field309 >= 0) { // L: 380 + this.method915(); // L: 382 + this.remove(); // L: 383 + return; // L: 384 } - this.field332 = var5 - 1; + this.field318 = var5 - 1; } - this.field332 += this.field326 * var1; - if (this.numLoops < 0) { - if (!this.field329) { - if (this.field326 < 0) { - if (this.field332 >= var3) { + this.field318 += this.field309 * var1; // L: 387 + if (this.numLoops < 0) { // L: 388 + if (!this.field315) { // L: 389 + if (this.field309 < 0) { // L: 404 + if (this.field318 >= var3) { // L: 405 return; } - this.field332 = var4 - 1 - (var4 - 1 - this.field332) % var6; + this.field318 = var4 - 1 - (var4 - 1 - this.field318) % var6; // L: 406 } else { - if (this.field332 < var4) { + if (this.field318 < var4) { // L: 409 return; } - this.field332 = var3 + (this.field332 - var3) % var6; + this.field318 = var3 + (this.field318 - var3) % var6; // L: 410 } } else { - if (this.field326 < 0) { - if (this.field332 >= var3) { + if (this.field309 < 0) { // L: 390 + if (this.field318 >= var3) { // L: 391 return; } - this.field332 = var3 + var3 - 1 - this.field332; - this.field326 = -this.field326; + this.field318 = var3 + var3 - 1 - this.field318; // L: 392 + this.field309 = -this.field309; // L: 393 } - while (this.field332 >= var4) { - this.field332 = var4 + var4 - 1 - this.field332; - this.field326 = -this.field326; - if (this.field332 >= var3) { + while (this.field318 >= var4) { // L: 396 + this.field318 = var4 + var4 - 1 - this.field318; // L: 397 + this.field309 = -this.field309; // L: 398 + if (this.field318 >= var3) { // L: 399 return; } - this.field332 = var3 + var3 - 1 - this.field332; - this.field326 = -this.field326; + this.field318 = var3 + var3 - 1 - this.field318; // L: 400 + this.field309 = -this.field309; // L: 401 } } } else { - if (this.numLoops > 0) { - if (this.field329) { + if (this.numLoops > 0) { // L: 414 + if (this.field315) { // L: 415 label129: { - if (this.field326 < 0) { - if (this.field332 >= var3) { + if (this.field309 < 0) { // L: 416 + if (this.field318 >= var3) { // L: 417 return; } - this.field332 = var3 + var3 - 1 - this.field332; - this.field326 = -this.field326; - if (--this.numLoops == 0) { + this.field318 = var3 + var3 - 1 - this.field318; // L: 418 + this.field309 = -this.field309; // L: 419 + if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field332 < var4) { + if (this.field318 < var4) { // L: 423 return; } - this.field332 = var4 + var4 - 1 - this.field332; - this.field326 = -this.field326; - if (--this.numLoops == 0) { + this.field318 = var4 + var4 - 1 - this.field318; // L: 424 + this.field309 = -this.field309; // L: 425 + if (--this.numLoops == 0) { // L: 426 break; } - if (this.field332 >= var3) { + if (this.field318 >= var3) { // L: 427 return; } - this.field332 = var3 + var3 - 1 - this.field332; - this.field326 = -this.field326; - } while(--this.numLoops != 0); + this.field318 = var3 + var3 - 1 - this.field318; // L: 428 + this.field309 = -this.field309; // L: 429 + } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field326 < 0) { - if (this.field332 >= var3) { + if (this.field309 < 0) { // L: 433 + if (this.field318 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field332) / var6; - if (var7 >= this.numLoops) { - this.field332 += var6 * this.numLoops; - this.numLoops = 0; - break label161; + var7 = (var4 - 1 - this.field318) / var6; // L: 435 + if (var7 >= this.numLoops) { // L: 436 + this.field318 += var6 * this.numLoops; // L: 437 + this.numLoops = 0; // L: 438 + break label161; // L: 439 } - this.field332 += var6 * var7; - this.numLoops -= var7; + this.field318 += var6 * var7; // L: 441 + this.numLoops -= var7; // L: 442 } else { - if (this.field332 < var4) { + if (this.field318 < var4) { // L: 445 return; } - var7 = (this.field332 - var3) / var6; - if (var7 >= this.numLoops) { - this.field332 -= var6 * this.numLoops; - this.numLoops = 0; - break label161; + var7 = (this.field318 - var3) / var6; // L: 446 + if (var7 >= this.numLoops) { // L: 447 + this.field318 -= var6 * this.numLoops; // L: 448 + this.numLoops = 0; // L: 449 + break label161; // L: 450 } - this.field332 -= var6 * var7; - this.numLoops -= var7; + this.field318 -= var6 * var7; // L: 452 + this.numLoops -= var7; // L: 453 } - return; + return; // L: 455 } } } - if (this.field326 < 0) { - if (this.field332 < 0) { - this.field332 = -1; - this.method804(); - this.remove(); + if (this.field309 < 0) { // L: 457 + if (this.field318 < 0) { // L: 458 + this.field318 = -1; // L: 459 + this.method915(); // L: 460 + this.remove(); // L: 461 } - } else if (this.field332 >= var5) { - this.field332 = var5; - this.method804(); - this.remove(); + } else if (this.field318 >= var5) { // L: 465 + this.field318 = var5; // L: 466 + this.method915(); // L: 467 + this.remove(); // L: 468 } } + } // L: 412 471 + + @ObfuscatedName("y") + public synchronized void method821(int var1) { + this.method822(var1 << 6, this.method824()); // L: 83 + } // L: 84 + + @ObfuscatedName("k") + synchronized void method927(int var1) { + this.method822(var1, this.method824()); // L: 87 + } // L: 88 + + @ObfuscatedName("t") + synchronized void method822(int var1, int var2) { + this.field307 = var1; // L: 91 + this.field308 = var2; // L: 92 + this.field316 = 0; // L: 93 + this.method818(); // L: 94 + } // L: 95 + + @ObfuscatedName("l") + public synchronized int method936() { + return this.field307 == Integer.MIN_VALUE ? 0 : this.field307; // L: 98 } - @ObfuscatedName("w") - public synchronized void method891(int var1) { - this.method799(var1 << 6, this.method801()); + @ObfuscatedName("u") + public synchronized int method824() { + return this.field308 < 0 ? -1 : this.field308; // L: 102 } - @ObfuscatedName("g") - synchronized void method884(int var1) { - this.method799(var1, this.method801()); - } - - @ObfuscatedName("v") - synchronized void method799(int var1, int var2) { - this.field321 = var1; - this.field322 = var2; - this.field320 = 0; - this.method795(); - } - - @ObfuscatedName("s") - public synchronized int method852() { - return this.field321 == Integer.MIN_VALUE ? 0 : this.field321; - } - - @ObfuscatedName("c") - public synchronized int method801() { - return this.field322 < 0 ? -1 : this.field322; - } - - @ObfuscatedName("b") - public synchronized void method839(int var1) { - int var2 = ((RawSound)super.sound).samples.length << 8; - if (var1 < -1) { + @ObfuscatedName("n") + public synchronized void method825(int var1) { + int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 + if (var1 < -1) { // L: 107 var1 = -1; } - if (var1 > var2) { + if (var1 > var2) { // L: 108 var1 = var2; } - this.field332 = var1; - } + this.field318 = var1; // L: 109 + } // L: 110 - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method803() { - this.field326 = (this.field326 ^ this.field326 >> 31) + (this.field326 >>> 31); - this.field326 = -this.field326; - } + public synchronized void method922() { + this.field309 = (this.field309 ^ this.field309 >> 31) + (this.field309 >>> 31); // L: 113 + this.field309 = -this.field309; // L: 114 + } // L: 115 - @ObfuscatedName("p") - void method804() { - if (this.field320 != 0) { - if (this.field321 == Integer.MIN_VALUE) { - this.field321 = 0; + @ObfuscatedName("q") + void method915() { + if (this.field316 != 0) { // L: 118 + if (this.field307 == Integer.MIN_VALUE) { + this.field307 = 0; // L: 119 } - this.field320 = 0; - this.method795(); + this.field316 = 0; // L: 120 + this.method818(); // L: 121 } - } + } // L: 123 - @ObfuscatedName("z") - public synchronized void method805(int var1, int var2) { - this.method806(var1, var2, this.method801()); - } + @ObfuscatedName("d") + public synchronized void method941(int var1, int var2) { + this.method829(var1, var2, this.method824()); // L: 126 + } // L: 127 - @ObfuscatedName("h") - public synchronized void method806(int var1, int var2, int var3) { - if (var1 == 0) { - this.method799(var2, var3); + @ObfuscatedName("r") + public synchronized void method829(int var1, int var2, int var3) { + if (var1 == 0) { // L: 130 + this.method822(var2, var3); // L: 131 } else { - int var4 = method865(var2, var3); - int var5 = method790(var2, var3); - if (var4 == this.field324 && var5 == this.field325) { - this.field320 = 0; + int var4 = method826(var2, var3); // L: 134 + int var5 = method968(var2, var3); // L: 135 + if (var4 == this.field310 && var5 == this.field305) { // L: 136 + this.field316 = 0; // L: 137 } else { - int var6 = var2 - this.field323; - if (this.field323 - var2 > var6) { - var6 = this.field323 - var2; + int var6 = var2 - this.field311; // L: 140 + if (this.field311 - var2 > var6) { // L: 141 + var6 = this.field311 - var2; } - if (var4 - this.field324 > var6) { - var6 = var4 - this.field324; + if (var4 - this.field310 > var6) { // L: 142 + var6 = var4 - this.field310; } - if (this.field324 - var4 > var6) { - var6 = this.field324 - var4; + if (this.field310 - var4 > var6) { // L: 143 + var6 = this.field310 - var4; } - if (var5 - this.field325 > var6) { - var6 = var5 - this.field325; + if (var5 - this.field305 > var6) { + var6 = var5 - this.field305; // L: 144 } - if (this.field325 - var5 > var6) { - var6 = this.field325 - var5; + if (this.field305 - var5 > var6) { // L: 145 + var6 = this.field305 - var5; } - if (var1 > var6) { + if (var1 > var6) { // L: 146 var1 = var6; } - this.field320 = var1; - this.field321 = var2; - this.field322 = var3; - this.field331 = (var2 - this.field323) / var1; - this.field330 = (var4 - this.field324) / var1; - this.field319 = (var5 - this.field325) / var1; + this.field316 = var1; // L: 147 + this.field307 = var2; // L: 148 + this.field308 = var3; // L: 149 + this.field317 = (var2 - this.field311) / var1; // L: 150 + this.field306 = (var4 - this.field310) / var1; // L: 151 + this.field319 = (var5 - this.field305) / var1; // L: 152 } } - } + } // L: 132 138 153 - @ObfuscatedName("o") - public synchronized void method807(int var1) { - if (var1 == 0) { - this.method884(0); - this.remove(); - } else if (this.field324 == 0 && this.field325 == 0) { - this.field320 = 0; - this.field321 = 0; - this.field323 = 0; - this.remove(); + @ObfuscatedName("m") + public synchronized void method830(int var1) { + if (var1 == 0) { // L: 156 + this.method927(0); // L: 157 + this.remove(); // L: 158 + } else if (this.field310 == 0 && this.field305 == 0) { // L: 161 + this.field316 = 0; // L: 162 + this.field307 = 0; // L: 163 + this.field311 = 0; // L: 164 + this.remove(); // L: 165 } else { - int var2 = -this.field323; - if (this.field323 > var2) { - var2 = this.field323; + int var2 = -this.field311; // L: 168 + if (this.field311 > var2) { // L: 169 + var2 = this.field311; } - if (-this.field324 > var2) { - var2 = -this.field324; + if (-this.field310 > var2) { // L: 170 + var2 = -this.field310; } - if (this.field324 > var2) { - var2 = this.field324; + if (this.field310 > var2) { // L: 171 + var2 = this.field310; } - if (-this.field325 > var2) { - var2 = -this.field325; + if (-this.field305 > var2) { // L: 172 + var2 = -this.field305; } - if (this.field325 > var2) { - var2 = this.field325; + if (this.field305 > var2) { // L: 173 + var2 = this.field305; } - if (var1 > var2) { + if (var1 > var2) { // L: 174 var1 = var2; } - this.field320 = var1; - this.field321 = Integer.MIN_VALUE; - this.field331 = -this.field323 / var1; - this.field330 = -this.field324 / var1; - this.field319 = -this.field325 / var1; + this.field316 = var1; // L: 175 + this.field307 = Integer.MIN_VALUE; // L: 176 + this.field317 = -this.field311 / var1; // L: 177 + this.field306 = -this.field310 / var1; // L: 178 + this.field319 = -this.field305 / var1; // L: 179 } - } + } // L: 159 166 180 - @ObfuscatedName("r") - public synchronized void method808(int var1) { - if (this.field326 < 0) { - this.field326 = -var1; + @ObfuscatedName("c") + public synchronized void method912(int var1) { + if (this.field309 < 0) { // L: 183 + this.field309 = -var1; } else { - this.field326 = var1; + this.field309 = var1; // L: 184 } + } // L: 185 + + @ObfuscatedName("f") + public synchronized int method832() { + return this.field309 < 0 ? -this.field309 : this.field309; // L: 188 } - @ObfuscatedName("n") - public synchronized int method797() { - return this.field326 < 0 ? -this.field326 : this.field326; + @ObfuscatedName("h") + public boolean method833() { + return this.field318 < 0 || this.field318 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } - @ObfuscatedName("u") - public boolean method810() { - return this.field332 < 0 || this.field332 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("v") + public boolean method834() { + return this.field316 != 0; // L: 196 } - @ObfuscatedName("ah") - public boolean method920() { - return this.field320 != 0; - } - - @ObfuscatedName("ay") - int method885(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ab") + int method827(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field320 > 0) { - int var6 = var2 + this.field320; - if (var6 > var4) { + if (this.field316 > 0) { // L: 474 + int var6 = var2 + this.field316; // L: 475 + if (var6 > var4) { // L: 476 var6 = var4; } - this.field320 += var2; - if (this.field326 == 256 && (this.field332 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method829(0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, this.field330, this.field319, 0, var6, var3, this); + this.field316 += var2; // L: 477 + if (this.field309 == 256 && (this.field318 & 255) == 0) { // L: 478 + if (PcmPlayer.PcmPlayer_stereo) { // L: 479 + var2 = method852(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this); } else { - var2 = method867(((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, this.field331, 0, var6, var3, this); + var2 = method960(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this); // L: 480 } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method833(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, this.field330, this.field319, 0, var6, var3, this, this.field326, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 + var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this, this.field309, var5); } else { - var2 = method832(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, this.field331, 0, var6, var3, this, this.field326, var5); + var2 = method855(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this, this.field309, var5); // L: 484 } - this.field320 -= var2; - if (this.field320 != 0) { + this.field316 -= var2; // L: 486 + if (this.field316 != 0) { // L: 487 return var2; } - if (!this.method912()) { + if (!this.method954()) { // L: 488 continue; } return var4; } - if (this.field326 == 256 && (this.field332 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method821(0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, 0, var4, var3, this); + if (this.field309 == 256 && (this.field318 & 255) == 0) { // L: 490 + if (PcmPlayer.PcmPlayer_stereo) { // L: 491 + return method962(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this); } - return method826(((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, 0, var4, var3, this); + return method843(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this); // L: 492 } - if (PcmPlayer.PcmPlayer_stereo) { - return method825(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, 0, var4, var3, this, this.field326, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 495 + return method848(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this, this.field309, var5); } - return method824(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, 0, var4, var3, this, this.field326, var5); + return method847(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this, this.field309, var5); // L: 496 } } - @ObfuscatedName("al") - int method818(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ar") + int method841(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field320 > 0) { - int var6 = var2 + this.field320; - if (var6 > var4) { + if (this.field316 > 0) { // L: 501 + int var6 = var2 + this.field316; // L: 502 + if (var6 > var4) { // L: 503 var6 = var4; } - this.field320 += var2; - if (this.field326 == -256 && (this.field332 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method831(0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, this.field330, this.field319, 0, var6, var3, this); + this.field316 += var2; // L: 504 + if (this.field309 == -256 && (this.field318 & 255) == 0) { // L: 505 + if (PcmPlayer.PcmPlayer_stereo) { // L: 506 + var2 = method854(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this); } else { - var2 = method830(((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, this.field331, 0, var6, var3, this); + var2 = method831(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this); // L: 507 } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method835(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, this.field330, this.field319, 0, var6, var3, this, this.field326, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 + var2 = method858(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this, this.field309, var5); } else { - var2 = method834(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, this.field331, 0, var6, var3, this, this.field326, var5); + var2 = method899(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this, this.field309, var5); // L: 511 } - this.field320 -= var2; - if (this.field320 != 0) { + this.field316 -= var2; // L: 513 + if (this.field316 != 0) { // L: 514 return var2; } - if (!this.method912()) { + if (!this.method954()) { // L: 515 continue; } return var4; } - if (this.field326 == -256 && (this.field332 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method823(0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, 0, var4, var3, this); + if (this.field309 == -256 && (this.field318 & 255) == 0) { // L: 517 + if (PcmPlayer.PcmPlayer_stereo) { // L: 518 + return method846(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this); } - return method909(((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, 0, var4, var3, this); + return method845(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this); // L: 519 } - if (PcmPlayer.PcmPlayer_stereo) { - return method812(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field324, this.field325, 0, var4, var3, this, this.field326, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 522 + return method850(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this, this.field309, var5); } - return method907(0, 0, ((RawSound)super.sound).samples, var1, this.field332, var2, this.field323, 0, var4, var3, this, this.field326, var5); + return method849(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this, this.field309, var5); // L: 523 + } + } + + @ObfuscatedName("ad") + boolean method954() { + int var1 = this.field307; // L: 528 + int var2; + int var3; + if (var1 == Integer.MIN_VALUE) { // L: 531 + var3 = 0; // L: 532 + var2 = 0; // L: 533 + var1 = 0; // L: 534 + } else { + var2 = method826(var1, this.field308); // L: 537 + var3 = method968(var1, this.field308); // L: 538 + } + + if (var1 == this.field311 && var2 == this.field310 && var3 == this.field305) { // L: 540 + if (this.field307 == Integer.MIN_VALUE) { // L: 570 + this.field307 = 0; // L: 571 + this.field305 = 0; // L: 572 + this.field310 = 0; // L: 573 + this.field311 = 0; // L: 574 + this.remove(); // L: 575 + return true; // L: 576 + } else { + this.method818(); // L: 578 + return false; // L: 579 + } + } else { + if (this.field311 < var1) { // L: 541 + this.field317 = 1; // L: 542 + this.field316 = var1 - this.field311; // L: 543 + } else if (this.field311 > var1) { // L: 545 + this.field317 = -1; // L: 546 + this.field316 = this.field311 - var1; // L: 547 + } else { + this.field317 = 0; // L: 549 + } + + if (this.field310 < var2) { // L: 550 + this.field306 = 1; // L: 551 + if (this.field316 == 0 || this.field316 > var2 - this.field310) { // L: 552 + this.field316 = var2 - this.field310; + } + } else if (this.field310 > var2) { // L: 554 + this.field306 = -1; // L: 555 + if (this.field316 == 0 || this.field316 > this.field310 - var2) { // L: 556 + this.field316 = this.field310 - var2; + } + } else { + this.field306 = 0; // L: 558 + } + + if (this.field305 < var3) { // L: 559 + this.field319 = 1; // L: 560 + if (this.field316 == 0 || this.field316 > var3 - this.field305) { // L: 561 + this.field316 = var3 - this.field305; + } + } else if (this.field305 > var3) { // L: 563 + this.field319 = -1; // L: 564 + if (this.field316 == 0 || this.field316 > this.field305 - var3) { // L: 565 + this.field316 = this.field305 - var3; + } + } else { + this.field319 = 0; // L: 567 + } + + return false; // L: 568 } } @ObfuscatedName("au") - boolean method912() { - int var1 = this.field321; - int var2; - int var3; - if (var1 == Integer.MIN_VALUE) { - var3 = 0; - var2 = 0; - var1 = 0; - } else { - var2 = method865(var1, this.field322); - var3 = method790(var1, this.field322); - } - - if (var1 == this.field323 && var2 == this.field324 && var3 == this.field325) { - if (this.field321 == Integer.MIN_VALUE) { - this.field321 = 0; - this.field325 = 0; - this.field324 = 0; - this.field323 = 0; - this.remove(); - return true; - } else { - this.method795(); - return false; - } - } else { - if (this.field323 < var1) { - this.field331 = 1; - this.field320 = var1 - this.field323; - } else if (this.field323 > var1) { - this.field331 = -1; - this.field320 = this.field323 - var1; - } else { - this.field331 = 0; - } - - if (this.field324 < var2) { - this.field330 = 1; - if (this.field320 == 0 || this.field320 > var2 - this.field324) { - this.field320 = var2 - this.field324; - } - } else if (this.field324 > var2) { - this.field330 = -1; - if (this.field320 == 0 || this.field320 > this.field324 - var2) { - this.field320 = this.field324 - var2; - } - } else { - this.field330 = 0; - } - - if (this.field325 < var3) { - this.field319 = 1; - if (this.field320 == 0 || this.field320 > var3 - this.field325) { - this.field320 = var3 - this.field325; - } - } else if (this.field325 > var3) { - this.field319 = -1; - if (this.field320 == 0 || this.field320 > this.field325 - var3) { - this.field320 = this.field325 - var3; - } - } else { - this.field319 = 0; - } - - return false; - } - } - - @ObfuscatedName("aq") - int vmethod944() { - int var1 = this.field323 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field332 / (((RawSound)super.sound).samples.length << 8); + int vmethod974() { + int var1 = this.field311 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field318 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } - return var1 > 255 ? 255 : var1; + return var1 > 255 ? 255 : var1; // L: 35 } - @ObfuscatedName("l") - static int method865(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); + @ObfuscatedName("i") + static int method826(int var0, int var1) { + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("q") - static int method790(int var0, int var1) { - return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); + @ObfuscatedName("w") + static int method968(int var0, int var1) { + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Laa;II)Lan;" + descriptor = "(Laz;II)Lax;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field279 * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(UserComparator2.field4359 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Laa;III)Lan;" + descriptor = "(Laz;III)Lax;" ) - public static RawPcmStream method794(RawSound var0, int var1, int var2, int var3) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILan;)I" - ) - static int method826(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - 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) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - } - - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { - var10001 = var3++; - } - - var8.field332 = var2 << 8; - return var3; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILan;)I" - ) - static int method821(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; - var9 >>= 8; - var5 <<= 2; - var6 <<= 2; - if ((var7 = var4 + var9 - var3) > var8) { - var7 = var8; - } - - var4 <<= 1; - var7 <<= 1; - - int var10001; - byte var11; - 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; - var10001 = var4++; - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - var10.field332 = var3 << 8; - return var4 >> 1; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILan;)I" - ) - static int method909(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - 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) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - } - - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { - var10001 = var3++; - } - - var8.field332 = var2 << 8; - return var3; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILan;)I" - ) - static int method823(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; - var9 >>= 8; - var5 <<= 2; - var6 <<= 2; - if ((var7 = var3 + var4 - (var9 - 1)) > var8) { - var7 = var8; - } - - var4 <<= 1; - var7 <<= 1; - - int var10001; - byte var11; - 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; - var10001 = var4++; - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - var10.field332 = var3 << 8; - return var4 >> 1; + public static RawPcmStream method817(RawSound var0, int var1, int var2, int var3) { + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69 } @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILan;II)I" + descriptor = "([B[IIIIIIILax;)I" ) - static int method824(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { - var7 = var8; - } - - byte var13; - int var10001; - 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; - } - - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { - var7 = var8; - } - - for (var1 = var12; var5 < var7; var4 += var11) { - var13 = var2[var4 >> 8]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; - } - - var10.field332 = var4; - return var5; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILan;II)I" - ) - static int method825(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { - var8 = var9; - } - - var5 <<= 1; - - byte var14; - int var10001; - 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++; - var3[var10001] += var0 * var7 >> 6; - } - - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { - var8 = var9; - } - - var8 <<= 1; - - 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++; - var3[var10001] += var0 * var7 >> 6; - } - - var11.field332 = var4; - return var5 >> 1; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILan;II)I" - ) - static int method907(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { - var7 = var8; + static int method843(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 + var5 = var6; } int var10001; - 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; + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 587 588 + var10001 = var3++; // L: 589 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 590 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 591 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 592 } - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { - var7 = var8; + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 594 595 + var10001 = var3++; // L: 596 } - var0 = var12; - - for (var1 = var11; var5 < var7; var4 += var1) { - var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - } - - var10.field332 = var4; - return var5; + var8.field318 = var2 << 8; // L: 598 + return var3; // L: 599 } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILan;II)I" + descriptor = "(I[B[IIIIIIIILax;)I" ) - static int method812(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { - var8 = var9; + static int method962(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 + var7 = var8; } - var5 <<= 1; + var4 <<= 1; // L: 608 + var7 <<= 1; // L: 609 int var10001; - 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++; - var3[var10001] += var0 * var7 >> 6; + 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 + var10001 = var4++; + var2[var10001] += var11 * var5; // L: 622 + var10001 = var4++; // L: 623 } - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { - var8 = var9; + 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++; } - var8 <<= 1; - - 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++; - var3[var10001] += var0 * var7 >> 6; - } - - var11.field332 = var4; - return var5 >> 1; + var10.field318 = var3 << 8; // L: 631 + return var4 >> 1; // L: 632 } - @ObfuscatedName("am") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILan;)I" + descriptor = "([B[IIIIIIILax;)I" ) - static int method867(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; - var8 >>= 8; - var4 <<= 2; - var5 <<= 2; - if ((var6 = var3 + var8 - var2) > var7) { - var6 = var7; + static int method845(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 + var5 = var6; } - var9.field324 += var9.field330 * (var6 - var3); - var9.field325 += var9.field319 * (var6 - var3); - int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 640 641 + var10001 = var3++; // L: 642 + var1[var10001] += var0[var2--] * var4; var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + var1[var10001] += var0[var2--] * var4; // L: 643 + var10001 = var3++; // L: 644 + var1[var10001] += var0[var2--] * var4; + var10001 = var3++; // L: 645 } - for (var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 647 648 + var10001 = var3++; // L: 649 } - var9.field323 = var4 >> 2; - var9.field332 = var2 << 8; - return var3; + var8.field318 = var2 << 8; // L: 651 + return var3; // L: 652 } @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILan;)I" + descriptor = "(I[B[IIIIIIIILax;)I" ) - static int method829(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; - var11 >>= 8; - var5 <<= 2; - var6 <<= 2; - var7 <<= 2; - var8 <<= 2; - if ((var9 = var11 + var4 - var3) > var10) { - var9 = var10; + static int method846(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 + var7 = var8; } - var12.field323 += var12.field331 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; + var4 <<= 1; // L: 661 + var7 <<= 1; // L: 662 + + 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 + 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.field318 = var3 << 8; // L: 684 + return var4 >> 1; // L: 685 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILax;II)I" + ) + static int method847(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 + var7 = var8; + } byte var13; int var10001; - for (var9 -= 6; var4 < var9; 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; - var6 += var8; - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + while (var5 < var7) { // L: 690 + var1 = var4 >> 8; // L: 691 + var13 = var2[var1]; // L: 692 + var10001 = var5++; // L: 693 + var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; // L: 694 } - for (var9 += 6; var4 < var9; var6 += var8) { - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { // L: 696 + var7 = var8; } - var12.field324 = var5 >> 2; - var12.field325 = var6 >> 2; - var12.field332 = var3 << 8; - return var4 >> 1; + for (var1 = var12; var5 < var7; var4 += var11) { // L: 697 698 701 + var13 = var2[var4 >> 8]; // L: 699 + var10001 = var5++; + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 + } + + var10.field318 = var4; // L: 703 + return var5; // L: 704 } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILan;)I" + descriptor = "(II[B[IIIIIIIILax;II)I" ) - static int method830(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; - var8 >>= 8; - var4 <<= 2; - var5 <<= 2; - if ((var6 = var3 + var2 - (var8 - 1)) > var7) { + static int method848(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 + var8 = var9; + } + + var5 <<= 1; // L: 709 + + 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 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 716 + var3[var10001] += var0 * var7 >> 6; + } + + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 719 + var8 = var9; + } + + var8 <<= 1; // L: 720 + + 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 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 726 + var3[var10001] += var0 * var7 >> 6; + } + + var11.field318 = var4; // L: 729 + return var5 >> 1; // L: 730 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILax;II)I" + ) + static int method849(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 + var7 = var8; + } + + int var10001; + while (var5 < var7) { // L: 735 + var1 = var4 >> 8; // L: 736 + byte var13 = var2[var1 - 1]; // L: 737 + var10001 = var5++; // L: 738 + var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; // L: 739 + } + + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { // L: 741 + var7 = var8; + } + + var0 = var12; // L: 742 + + for (var1 = var11; var5 < var7; var4 += var1) { // L: 743 744 746 + var10001 = var5++; + var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 + } + + var10.field318 = var4; // L: 748 + return var5; // L: 749 + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILax;II)I" + ) + static int method850(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 + var8 = var9; + } + + var5 <<= 1; // L: 754 + + 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 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 761 + var3[var10001] += var0 * var7 >> 6; + } + + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { // L: 764 + var8 = var9; + } + + var8 <<= 1; // L: 765 + + 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 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 770 + var3[var10001] += var0 * var7 >> 6; + } + + var11.field318 = var4; // L: 773 + return var5 >> 1; // L: 774 + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILax;)I" + ) + static int method960(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 var6 = var7; } - var9.field324 += var9.field330 * (var6 - var3); - var9.field325 += var9.field319 * (var6 - var3); + var9.field310 += var9.field306 * (var6 - var3); // L: 783 + var9.field305 += var9.field319 * (var6 - var3); // L: 784 int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 + var10001 = var3++; // L: 787 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 788 + var10001 = var3++; // L: 789 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 790 + var10001 = var3++; // L: 791 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 792 + var10001 = var3++; // L: 793 + var1[var10001] += var0[var2++] * var4; } - for (var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + for (var6 += 3; var3 < var6; var4 += var5) { // L: 796 797 799 + var10001 = var3++; // L: 798 + var1[var10001] += var0[var2++] * var4; } - var9.field323 = var4 >> 2; - var9.field332 = var2 << 8; - return var3; + var9.field311 = var4 >> 2; // L: 801 + var9.field318 = var2 << 8; // L: 802 + return var3; // L: 803 } - @ObfuscatedName("ae") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILan;)I" + descriptor = "(I[B[IIIIIIIIIILax;)I" ) - static int method831(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; - var11 >>= 8; - var5 <<= 2; - var6 <<= 2; - var7 <<= 2; - var8 <<= 2; - if ((var9 = var3 + var4 - (var11 - 1)) > var10) { + static int method852(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 var9 = var10; } - var12.field323 += var12.field331 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; + var12.field311 += var12.field317 * (var9 - var4); // L: 814 + var4 <<= 1; // L: 815 + var9 <<= 1; // L: 816 byte var13; int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { - var13 = var1[var3--]; - var10001 = var4++; + 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; - var10001 = var4++; + var5 += var7; // L: 821 + var10001 = var4++; // L: 822 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 823 + var13 = var1[var3++]; // L: 824 + var10001 = var4++; // L: 825 var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; + var5 += var7; // L: 826 + var10001 = var4++; // L: 827 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 828 + var13 = var1[var3++]; // L: 829 + var10001 = var4++; // L: 830 var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; + var5 += var7; // L: 831 + var10001 = var4++; // L: 832 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 833 + var13 = var1[var3++]; // L: 834 + var10001 = var4++; // L: 835 var2[var10001] += var13 * var5; - var5 += var7; + var5 += var7; // L: 836 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 var2[var10001] += var13 * var6; } - 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.field324 = var5 >> 2; - var12.field325 = var6 >> 2; - var12.field332 = var3 << 8; - return var4 >> 1; + var12.field310 = var5 >> 2; // L: 848 + var12.field305 = var6 >> 2; // L: 849 + var12.field318 = var3 << 8; // L: 850 + return var4 >> 1; // L: 851 } - @ObfuscatedName("ai") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILan;II)I" + descriptor = "([B[IIIIIIIILax;)I" ) - static int method832(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field324 -= var11.field330 * var5; - var11.field325 -= var11.field319 * var5; - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + static int method831(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 + var6 = var7; + } + + var9.field310 += var9.field306 * (var6 - var3); // L: 860 + var9.field305 += var9.field319 * (var6 - var3); // L: 861 + + int var10001; + for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 + var10001 = var3++; // L: 864 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 865 + var10001 = var3++; // L: 866 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 867 + var10001 = var3++; // L: 868 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 869 + var10001 = var3++; // L: 870 + var1[var10001] += var0[var2--] * var4; + } + + for (var6 += 3; var3 < var6; var4 += var5) { // L: 873 874 876 + var10001 = var3++; // L: 875 + var1[var10001] += var0[var2--] * var4; + } + + var9.field311 = var4 >> 2; // L: 878 + var9.field318 = var2 << 8; // L: 879 + return var3; // L: 880 + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILax;)I" + ) + static int method854(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 + var9 = var10; + } + + var12.field311 += var12.field317 * (var9 - var4); // L: 891 + var4 <<= 1; // L: 892 + var9 <<= 1; // L: 893 + + byte var13; + int var10001; + for (var9 -= 6; var4 < var9; var6 += var8) { // L: 894 895 915 + var13 = var1[var3--]; // L: 896 + var10001 = var4++; // L: 897 + var2[var10001] += var13 * var5; + var5 += var7; // L: 898 + var10001 = var4++; // L: 899 + var2[var10001] += var13 * var6; + var6 += var8; // L: 900 + var13 = var1[var3--]; // L: 901 + var10001 = var4++; // L: 902 + var2[var10001] += var13 * var5; + var5 += var7; // L: 903 + var10001 = var4++; // L: 904 + var2[var10001] += var13 * var6; + var6 += var8; // L: 905 + var13 = var1[var3--]; // L: 906 + var10001 = var4++; // L: 907 + var2[var10001] += var13 * var5; + var5 += var7; // L: 908 + var10001 = var4++; // L: 909 + var2[var10001] += var13 * var6; + var6 += var8; // L: 910 + var13 = var1[var3--]; // L: 911 + var10001 = var4++; // L: 912 + var2[var10001] += var13 * var5; + var5 += var7; // L: 913 + var10001 = var4++; // L: 914 + var2[var10001] += var13 * var6; + } + + for (var9 += 6; var4 < var9; var6 += var8) { // L: 917 918 923 + var13 = var1[var3--]; // L: 919 + var10001 = var4++; // L: 920 + var2[var10001] += var13 * var5; + var5 += var7; // L: 921 + var10001 = var4++; // L: 922 + var2[var10001] += var13 * var6; + } + + var12.field310 = var5 >> 2; // L: 925 + var12.field305 = var6 >> 2; // L: 926 + var12.field318 = var3 << 8; // L: 927 + return var4 >> 1; // L: 928 + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILax;II)I" + ) + static int method855(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.field310 -= var11.field306 * var5; // L: 932 + var11.field305 -= var11.field319 * var5; // L: 933 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } byte var14; int var10001; - while (var5 < var8) { - var1 = var4 >> 8; - var14 = var2[var1]; + while (var5 < var8) { // L: 935 + var1 = var4 >> 8; // L: 936 + var14 = var2[var1]; // L: 937 var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; - var4 += var12; + var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; // L: 938 + var6 += var7; // L: 939 + var4 += var12; // L: 940 } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 942 var8 = var9; } - for (var1 = var13; var5 < var8; var4 += var12) { - var14 = var2[var4 >> 8]; - var10001 = var5++; + for (var1 = var13; var5 < var8; var4 += var12) { // L: 943 944 948 + var14 = var2[var4 >> 8]; // L: 945 + var10001 = var5++; // L: 946 var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; + var6 += var7; // L: 947 } - var11.field324 += var11.field330 * var5; - var11.field325 += var11.field319 * var5; - var11.field323 = var6; - var11.field332 = var4; - return var5; + var11.field310 += var11.field306 * var5; // L: 950 + var11.field305 += var11.field319 * var5; // L: 951 + var11.field311 = var6; // L: 952 + var11.field318 = var4; // L: 953 + return var5; // L: 954 } - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILan;II)I" + descriptor = "(II[B[IIIIIIIIIILax;II)I" ) - static int method833(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.field323 -= var5 * var13.field331; - if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { + static int method856(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.field311 -= var5 * var13.field317; // L: 958 + if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } - var5 <<= 1; + var5 <<= 1; // L: 960 byte var16; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { - var1 = var4 >> 8; - var16 = var2[var1]; - var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); - var10001 = var5++; + 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 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 967 + var10001 = var5++; // L: 968 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 969 } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { // L: 972 var10 = var11; } - var10 <<= 1; + var10 <<= 1; // L: 973 - for (var1 = var15; var5 < var10; var4 += var14) { - var16 = var2[var4 >> 8]; - var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); - var10001 = var5++; + 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 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 979 + var10001 = var5++; // L: 980 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 981 } - var5 >>= 1; - var13.field323 += var13.field331 * var5; - var13.field324 = var6; - var13.field325 = var7; - var13.field332 = var4; - return var5; + var5 >>= 1; // L: 984 + var13.field311 += var13.field317 * var5; // L: 985 + var13.field310 = var6; // L: 986 + var13.field305 = var7; // L: 987 + var13.field318 = var4; // L: 988 + return var5; // L: 989 } - @ObfuscatedName("bf") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILan;II)I" + descriptor = "(II[B[IIIIIIIILax;II)I" ) - static int method834(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.field324 -= var11.field330 * var5; - var11.field325 -= var11.field319 * var5; - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + static int method899(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.field310 -= var11.field306 * var5; // L: 993 + var11.field305 -= var11.field319 * var5; // L: 994 + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } int var10001; - while (var5 < var8) { - var1 = var4 >> 8; - byte var14 = var2[var1 - 1]; + while (var5 < var8) { // L: 996 + var1 = var4 >> 8; // L: 997 + byte var14 = var2[var1 - 1]; // L: 998 var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; - var4 += var12; + var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; // L: 999 + var6 += var7; // L: 1000 + var4 += var12; // L: 1001 } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { // L: 1003 var8 = var9; } - var0 = var13; + var0 = var13; // L: 1004 - for (var1 = var12; var5 < var8; var4 += var1) { - var10001 = var5++; + for (var1 = var12; var5 < var8; var4 += var1) { // L: 1005 1006 1009 + var10001 = var5++; // L: 1007 var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - var6 += var7; + var6 += var7; // L: 1008 } - var11.field324 += var11.field330 * var5; - var11.field325 += var11.field319 * var5; - var11.field323 = var6; - var11.field332 = var4; - return var5; + var11.field310 += var11.field306 * var5; // L: 1011 + var11.field305 += var11.field319 * var5; // L: 1012 + var11.field311 = var6; // L: 1013 + var11.field318 = var4; // L: 1014 + return var5; // L: 1015 } - @ObfuscatedName("bj") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILan;II)I" + descriptor = "(II[B[IIIIIIIIIILax;II)I" ) - static int method835(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.field323 -= var5 * var13.field331; - if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { + static int method858(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field311 -= var5 * var13.field317; // L: 1019 + if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } - var5 <<= 1; + var5 <<= 1; // L: 1021 int var10001; - 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++; + 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 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 1028 + var10001 = var5++; // L: 1029 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 1030 } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { // L: 1033 var10 = var11; } - var10 <<= 1; + var10 <<= 1; // L: 1034 - for (var1 = var15; var5 < var10; var4 += var14) { - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; + 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 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 1039 + var10001 = var5++; // L: 1040 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 1041 } - var5 >>= 1; - var13.field323 += var13.field331 * var5; - var13.field324 = var6; - var13.field325 = var7; - var13.field332 = var4; - return var5; + var5 >>= 1; // L: 1044 + var13.field311 += var13.field317 * var5; // L: 1045 + var13.field310 = var6; // L: 1046 + var13.field305 = var7; // L: 1047 + var13.field318 = var4; // L: 1048 + return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index c9182aeb94..e79aed368f 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,57 +3,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("az") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("samples") public byte[] samples; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("start") public int start; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("end") int end; - @ObfuscatedName("m") - public boolean field249; + @ObfuscatedName("o") + public boolean field238; RawSound(int var1, byte[] var2, int var3, int var4) { - this.sampleRate = var1; - this.samples = var2; - this.start = var3; - this.end = var4; - } + this.sampleRate = var1; // L: 13 + this.samples = var2; // L: 14 + this.start = var3; // L: 15 + this.end = var4; // L: 16 + } // L: 17 RawSound(int var1, byte[] var2, int var3, int var4, boolean var5) { - this.sampleRate = var1; - this.samples = var2; - this.start = var3; - this.end = var4; - this.field249 = var5; - } + this.sampleRate = var1; // L: 20 + this.samples = var2; // L: 21 + this.start = var3; // L: 22 + this.end = var4; // L: 23 + this.field238 = var5; // L: 24 + } // L: 25 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lai;)Laa;" + descriptor = "(Laa;)Laz;" ) @Export("resample") public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); - this.sampleRate = var1.scaleRate(this.sampleRate); - if (this.start == this.end) { + this.samples = var1.resample(this.samples); // L: 28 + this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 + if (this.start == this.end) { // L: 30 this.start = this.end = var1.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); - this.end = var1.scalePosition(this.end); - if (this.start == this.end) { + 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; } } - return this; + return this; // L: 36 } } diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index fe71713231..047fb9b3b7 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,203 +6,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bd") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("oe") - @ObfuscatedSignature( - descriptor = "[Ljt;" - ) - static Widget[] field452; - @ObfuscatedName("l") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -960883055 + intValue = -740973297 + ) + static int field429; + @ObfuscatedName("nt") + @ObfuscatedGetter( + intValue = 999048453 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -467081415 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -947967161 + intValue = 143972529 ) @Export("size") int size; - @ObfuscatedName("f") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("j") + @ObfuscatedName("s") @Export("operations") int[] operations; - @ObfuscatedName("m") - @Export("arguments") - byte[][][] arguments; - @ObfuscatedName("k") + @ObfuscatedName("a") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("t") + @ObfuscatedName("o") @Export("fields") Field[] fields; - @ObfuscatedName("a") + @ObfuscatedName("g") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("e") @Export("methods") Method[] methods; + @ObfuscatedName("p") + @Export("arguments") + byte[][][] arguments; ReflectionCheck() { - } + } // L: 17 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1468113087" + descriptor = "(IB)Les;", + garbageValue = "16" ) - static String method1064(int var0) { - return ""; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "-72" - ) - static int method1063(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 5; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7204) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 6; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7205 && var0 < 7209) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7209) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7210 && var0 < 7214) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 7214) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 + if (var1 != null) { // L: 28 + return var1; } else { - return 2; + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 + var1 = new KitDefinition(); // L: 30 + if (var2 != null) { // L: 31 + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 } } - @ObfuscatedName("hv") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-1574145218" + descriptor = "(I)I", + garbageValue = "611566572" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = ViewportMouse.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; - ViewportMouse.runScriptEvent(var6); - } - - boolean var8 = true; - if (var5.contentType > 0) { - var8 = class244.method4661(var5); - } - - if (var8) { - if (class138.method2756(WorldMapRegion.getWidgetFlags(var5), var0 - 1)) { - PacketBufferNode var7; - if (var0 == 1) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2688, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 2) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2760, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 3) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2752, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 4) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2698, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 5) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2743, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 6) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2766, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 7) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2730, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 8) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 9) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2705, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 10) { - var7 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2738, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - } - } - } + static int method1115() { + return Login.field871.length + Login.field885.length; // L: 143 } + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2023329615" + ) + static final void method1114() { + Client.field666 = Client.cycleCntr; // L: 11794 + class6.ClanChat_inClanChat = true; // L: 11795 + } // L: 11796 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index ae34a4ed84..b3d0c3f48e 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -3,420 +3,44 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hi") +@ObfuscatedName("hj") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("cz") + @ObfuscatedName("sd") @ObfuscatedGetter( - intValue = -721981307 + intValue = 1632556935 + ) + static int field2442; + @ObfuscatedName("cu") + @ObfuscatedGetter( + intValue = 1520356877 ) @Export("height") public int height; protected Renderable() { - this.height = 1000; - } + this.height = 1000; // L: 6 + } // L: 8 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected Model getModel() { - return null; + return null; // L: 19 } - @ObfuscatedName("cr") + @ObfuscatedName("cl") @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(); - if (var11 != null) { - this.height = var11.height; - var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, 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 } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-878810600" - ) - static void method4391() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - ClanChannelMember.logoSprite.drawAt(Login.xPadding + 382 - ClanChannelMember.logoSprite.subWidth / 2, 18); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILbe;ZS)I", - garbageValue = "14444" - ) - static int method4394(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = VertexNormal.Client_plane; - int var15 = (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX; - int var8 = (class67.localPlayer.y >> 7) + PlayerComposition.baseY; - GrandExchangeEvent.getWorldMap().method6504(var3, var15, var8, true); - return 1; - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - String var16 = ""; - var9 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var9 != null) { - var16 = var9.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - GrandExchangeEvent.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - GrandExchangeEvent.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - GrandExchangeEvent.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - GrandExchangeEvent.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - GrandExchangeEvent.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - GrandExchangeEvent.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var11 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var11 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var11 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var11 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var14 = GrandExchangeEvent.getWorldMap().getDisplayCoord(); - if (var14 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var14.x; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var14.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - var11 = GrandExchangeEvent.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); - if (var12 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var12[0]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var12[1]; - } - - return 1; - } - } else { - Coord var5; - if (var0 == 6618) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - var11 = GrandExchangeEvent.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var5 = var11.coord(var14.x, var14.y); - if (var5 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } - } else { - Coord var10; - if (var0 == 6619) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - WorldMapRegion.method3604(var3, var10, false); - return 1; - } else if (var0 == 6620) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - WorldMapRegion.method3604(var3, var10, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - var9 = GrandExchangeEvent.getWorldMap().getMapArea(var3); - if (var9 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var14 = new Coord(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - var11 = GrandExchangeEvent.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); - if (var11 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var11.getId(); - } - - return 1; - } else if (var0 == 6624) { - GrandExchangeEvent.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - GrandExchangeEvent.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - GrandExchangeEvent.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - GrandExchangeEvent.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var13 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - GrandExchangeEvent.getWorldMap().setPerpetualFlash(var13); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - GrandExchangeEvent.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - GrandExchangeEvent.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - GrandExchangeEvent.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var13 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - GrandExchangeEvent.getWorldMap().setElementsDisabled(var13); - return 1; - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] == 1; - GrandExchangeEvent.getWorldMap().disableElement(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] == 1; - GrandExchangeEvent.getWorldMap().setCategoryDisabled(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvent.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - var5 = GrandExchangeEvent.getWorldMap().method6467(var3, var10); - if (var5 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var6 = GrandExchangeEvent.getWorldMap().iconStart(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var6 = GrandExchangeEvent.getWorldMap().iconNext(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class13.WorldMapElement_get(var3); - if (var4.name == null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class13.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class13.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class13.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class130.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class130.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class130.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-3" - ) - static void method4395(int var0, int var1) { - MenuAction var2 = class137.tempMenuAction; - PlatformInfo.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); - class137.tempMenuAction = null; - } + } // L: 16 } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index fbfce5cf9f..87a3a08967 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,59 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fc") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("st") - @ObfuscatedSignature( - descriptor = "Lai;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("et") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("fp") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1344462217 + intValue = 12457579 ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("l") + public static int field1979; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + static StudioGame field1986; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1263236151 + intValue = -116469837 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 213463867 + intValue = -1807509661 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -384519969 + intValue = -655785289 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1744940785 + intValue = 1106041025 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { - } + } // L: 9 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIILfy;I)Z", - garbageValue = "1728008342" + descriptor = "(IIILfq;I)Z", + garbageValue = "-526381699" ) @Export("hasArrived") public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 2ce33fa41e..e5571f6729 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,36 +4,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ps") +@ObfuscatedName("pg") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2072562331 + intValue = -1816654499 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1605520639 + intValue = -312845881 ) @Export("clientType") public static int clientType; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("message") String message; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("throwable") Throwable throwable; RunException(Throwable var1, String var2) { - this.message = var2; - this.throwable = var1; - } + this.message = var2; // L: 27 + this.throwable = var1; // L: 28 + } // L: 29 } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 80c80b76a5..788afafa1c 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,96 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hf") @Implements("Scene") public class Scene { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("h") + @ObfuscatedName("r") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ah") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Lhw;" + descriptor = "[Lhv;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "[[Lhp;" + descriptor = "[[Lhw;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; @@ -101,859 +101,871 @@ public class Scene { static int Scene_currentOccludersCount; @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Lhp;" + descriptor = "[Lhw;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("am") - static final int[] field2390; - @ObfuscatedName("aw") - static final int[] field2428; - @ObfuscatedName("az") - static final int[] field2425; - @ObfuscatedName("ae") - static final int[] field2419; - @ObfuscatedName("ai") - static final int[] field2433; + @ObfuscatedName("aj") + static final int[] field2421; @ObfuscatedName("af") - static final int[] field2420; - @ObfuscatedName("bz") - static final int[] field2429; - @ObfuscatedName("bu") + static final int[] field2422; + @ObfuscatedName("aw") + static final int[] field2423; + @ObfuscatedName("ao") + static final int[] field2424; + @ObfuscatedName("aa") + static final int[] field2425; + @ObfuscatedName("ay") + static final int[] field2378; + @ObfuscatedName("bg") + static final int[] field2376; + @ObfuscatedName("bh") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bm") + @ObfuscatedName("br") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bv") + @ObfuscatedName("bj") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("planes") int planes; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("xSize") int xSize; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("ySize") int ySize; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[[[Lhz;" + descriptor = "[[[Lhm;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("minPlane") int minPlane; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lhw;" + descriptor = "[Lhv;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("i") - int[][][] field2439; - @ObfuscatedName("bo") + @ObfuscatedName("b") + int[][][] field2409; + @ObfuscatedName("bf") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bx") + @ObfuscatedName("bs") @Export("tileRotation2D") int[][] tileRotation2D; static { - 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(); - field2390 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2428 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2425 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2419 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2433 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2420 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2429 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; - visibilityMap = new boolean[8][32][51][51]; + 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 + field2421 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2422 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2423 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2424 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2425 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2378 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2376 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + visibilityMap = new boolean[8][32][51][51]; // L: 86 } public Scene(int var1, int var2, int var3, int[][][] var4) { - 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.field2439 = new int[var1][var2 + 1][var3 + 1]; - this.tileHeights = var4; - this.clear(); - } + 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.field2409 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.tileHeights = var4; // L: 101 + this.clear(); // L: 102 + } // L: 103 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("clear") public void clear() { int var1; int var2; - for (var1 = 0; var1 < this.planes; ++var1) { - for (var2 = 0; var2 < this.xSize; ++var2) { - for (int var3 = 0; var3 < this.ySize; ++var3) { + 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 this.tiles[var1][var2][var3] = null; } } } - for (var1 = 0; var1 < Scene_planesCount; ++var1) { - for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { + for (var1 = 0; var1 < Scene_planesCount; ++var1) { // L: 111 + for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { // L: 112 Scene_planeOccluders[var1][var2] = null; } - Scene_planeOccluderCounts[var1] = 0; + Scene_planeOccluderCounts[var1] = 0; // L: 113 } - for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { - this.tempGameObjects[var1] = null; + for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 115 + this.tempGameObjects[var1] = null; // L: 116 } - this.tempGameObjectsCount = 0; + this.tempGameObjectsCount = 0; // L: 118 - for (var1 = 0; var1 < gameObjects.length; ++var1) { + for (var1 = 0; var1 < gameObjects.length; ++var1) { // L: 119 gameObjects[var1] = null; } - } + } // L: 120 - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("init") public void init(int var1) { - this.minPlane = var1; + this.minPlane = var1; // L: 123 - for (int var2 = 0; var2 < this.xSize; ++var2) { - for (int var3 = 0; var3 < this.ySize; ++var3) { - if (this.tiles[var1][var2][var3] == null) { + 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 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } } } - } + } // L: 129 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; + Tile var3 = this.tiles[0][var1][var2]; // L: 132 - 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 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 var6 = 0; var6 < var5.gameObjectsCount; ++var6) { - GameObject var7 = var5.gameObjects[var6]; - if (class78.method2061(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 + GameObject var7 = var5.gameObjects[var6]; // L: 138 + long var9 = var7.tag; // L: 140 + int var11 = (int)(var9 >>> 14 & 3L); // L: 144 + boolean var8 = var11 == 2; // L: 146 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { + if (this.tiles[0][var1][var2] == null) { // L: 152 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; - this.tiles[3][var1][var2] = null; - } + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153 + this.tiles[3][var1][var2] = null; // L: 154 + } // L: 155 - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; - if (var5 != null) { - this.tiles[var1][var2][var3].minPlane = var4; + Tile var5 = this.tiles[var1][var2][var3]; // L: 174 + if (var5 != null) { // L: 175 + this.tiles[var1][var2][var3].minPlane = var4; // L: 176 } - } + } // L: 177 - @ObfuscatedName("k") + @ObfuscatedName("g") @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) { - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); + if (var4 == 0) { // L: 180 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 182 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - 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); + this.tiles[var1][var2][var3].paint = var21; // L: 183 + } else if (var4 != 1) { // L: 186 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 193 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].model = var23; + this.tiles[var1][var2][var3].model = var23; // L: 194 } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 188 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; + this.tiles[var1][var2][var3].paint = var21; // L: 189 } - } + } // L: 184 190 195 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIILhi;JI)V" + descriptor = "(IIIILhj;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - 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) { + if (var5 != null) { // L: 198 + FloorDecoration var9 = new FloorDecoration(); // L: 199 + var9.renderable = var5; // L: 200 + var9.x = var2 * 128 + 64; // L: 201 + var9.y = var3 * 128 + 64; // L: 202 + var9.tileHeight = var4; // L: 203 + var9.tag = var6; // L: 204 + var9.flags = var8; // L: 205 + if (this.tiles[var1][var2][var3] == null) { // L: 206 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207 } - } + } // L: 208 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIILhi;JLhi;Lhi;)V" + descriptor = "(IIIILhj;JLhj;Lhj;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); - 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) { + ItemLayer var10 = new ItemLayer(); // L: 211 + var10.first = var5; // L: 212 + var10.x = var2 * 128 + 64; // L: 213 + var10.y = var3 * 128 + 64; // L: 214 + var10.tileHeight = var4; // L: 215 + var10.tag = var6; // L: 216 + var10.second = var8; // L: 217 + var10.third = var9; // L: 218 + int var11 = 0; // L: 219 + Tile var12 = this.tiles[var1][var2][var3]; // L: 220 + if (var12 != null) { // L: 221 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224 + var14.calculateBoundsCylinder(); // L: 225 + if (var14.height > var11) { // L: 226 var11 = var14.height; } } } } - var10.height = var11; + var10.height = var11; // L: 230 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231 } - this.tiles[var1][var2][var3].itemLayer = var10; - } + this.tiles[var1][var2][var3].itemLayer = var10; // L: 232 + } // L: 233 - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIILhi;Lhi;IIJI)V" + descriptor = "(IIIILhj;Lhj;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { - 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; + if (var5 != null || var6 != null) { // L: 236 + BoundaryObject var12 = new BoundaryObject(); // L: 237 + var12.tag = var9; // L: 238 + var12.flags = var11; // L: 239 + var12.x = var2 * 128 + 64; // L: 240 + var12.y = var3 * 128 + 64; // L: 241 + var12.tileHeight = var4; // L: 242 + var12.renderable1 = var5; // L: 243 + var12.renderable2 = var6; // L: 244 + var12.orientationA = var7; // L: 245 + var12.orientationB = var8; // L: 246 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 247 } } - this.tiles[var1][var2][var3].boundaryObject = var12; + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248 } - } + } // L: 249 - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIILhi;Lhi;IIIIJI)V" + descriptor = "(IIIILhj;Lhj;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { - 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; + if (var5 != null) { // L: 252 + WallDecoration var14 = new WallDecoration(); // L: 253 + var14.tag = var11; // L: 254 + var14.flags = var13; // L: 255 + var14.x = var2 * 128 + 64; // L: 256 + var14.y = var3 * 128 + 64; // L: 257 + var14.tileHeight = var4; // L: 258 + var14.renderable1 = var5; // L: 259 + var14.renderable2 = var6; // L: 260 + var14.orientation = var7; // L: 261 + var14.orientation2 = var8; // L: 262 + var14.xOffset = var9; // L: 263 + var14.yOffset = var10; // L: 264 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 265 } } - this.tiles[var1][var2][var3].wallDecoration = var14; + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266 + } + } // L: 267 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIIIILhj;IJI)Z" + ) + public boolean method4289(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 270 + return true; + } else { + int var12 = var5 * 64 + var2 * 128; // L: 271 + int var13 = var6 * 64 + var3 * 128; // L: 272 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273 } } @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIIIILhi;IJI)Z" - ) - public boolean method4208(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { - return true; - } else { - int var12 = var5 * 64 + var2 * 128; - int var13 = var6 * 64 + var3 * 128; - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IIIIILhi;IJZ)Z" + descriptor = "(IIIIILhj;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { + if (var6 == null) { // L: 277 return true; } else { - int var11 = var2 - var5; - int var12 = var3 - var5; - int var13 = var5 + var2; - int var14 = var3 + var5; - if (var10) { - if (var7 > 640 && var7 < 1408) { + int var11 = var2 - var5; // L: 278 + int var12 = var3 - var5; // L: 279 + int var13 = var5 + var2; // L: 280 + int var14 = var3 + var5; // L: 281 + if (var10) { // L: 282 + if (var7 > 640 && var7 < 1408) { // L: 283 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { + if (var7 > 1152 && var7 < 1920) { // L: 284 var13 += 128; } - if (var7 > 1664 || var7 < 384) { + if (var7 > 1664 || var7 < 384) { // L: 285 var12 -= 128; } - if (var7 > 128 && var7 < 896) { + if (var7 > 128 && var7 < 896) { // L: 286 var11 -= 128; } } - var11 /= 128; - var12 /= 128; - var13 /= 128; - var14 /= 128; - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); + var11 /= 128; // L: 288 + var12 /= 128; // L: 289 + var13 /= 128; // L: 290 + var14 /= 128; // L: 291 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 } } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIIILhi;IJIIII)Z" + descriptor = "(IIIIILhj;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297 } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIIIIILhi;IZJI)Z" + descriptor = "(IIIIIIIILhj;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { - for (var16 = var3; var16 < var3 + var5; ++var16) { - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303 return false; } - Tile var23 = this.tiles[var1][var15][var16]; - if (var23 != null && var23.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; // L: 304 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305 return false; } } } - 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; + GameObject var21 = new GameObject(); // L: 308 + var21.tag = var12; // L: 309 + var21.flags = var14; // L: 310 + var21.plane = var1; // L: 311 + var21.centerX = var6; // L: 312 + var21.centerY = var7; // L: 313 + var21.height = var8; // L: 314 + var21.renderable = var9; // L: 315 + var21.orientation = var10; // L: 316 + var21.startX = var2; // L: 317 + var21.startY = var3; // L: 318 + var21.endX = var2 + var4 - 1; // L: 319 + var21.endY = var3 + var5 - 1; // L: 320 - for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var17 = var3; var17 < var3 + var5; ++var17) { - int var18 = 0; - if (var16 > var2) { + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322 + int var18 = 0; // L: 323 + if (var16 > var2) { // L: 324 ++var18; } - if (var16 < var2 + var4 - 1) { + if (var16 < var2 + var4 - 1) { // L: 325 var18 += 4; } - if (var17 > var3) { + if (var17 > var3) { // L: 326 var18 += 8; } - if (var17 < var3 + var5 - 1) { + if (var17 < var3 + var5 - 1) { // L: 327 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); + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328 } } - Tile var22 = this.tiles[var1][var16][var17]; - var22.gameObjects[var22.gameObjectsCount] = var21; - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; - var22.gameObjectsEdgeMask |= var18; - ++var22.gameObjectsCount; + Tile var22 = this.tiles[var1][var16][var17]; // L: 329 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331 + var22.gameObjectsEdgeMask |= var18; // L: 333 + ++var22.gameObjectsCount; // L: 334 } } - if (var11) { + if (var11) { // L: 337 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; + return true; // L: 338 } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { - GameObject var2 = this.tempGameObjects[var1]; - this.removeGameObject(var2); - this.tempGameObjects[var1] = null; + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342 + GameObject var2 = this.tempGameObjects[var1]; // L: 343 + this.removeGameObject(var2); // L: 344 + this.tempGameObjects[var1] = null; // L: 345 } - this.tempGameObjectsCount = 0; - } + this.tempGameObjectsCount = 0; // L: 347 + } // L: 348 - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lhw;)V" + descriptor = "(Lhv;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { - Tile var4 = this.tiles[var1.plane][var2][var3]; - if (var4 != null) { + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353 + if (var4 != null) { // L: 354 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] == var1) { - --var4.gameObjectsCount; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355 + if (var4.gameObjects[var5] == var1) { // L: 356 + --var4.gameObjectsCount; // L: 357 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360 } - var4.gameObjects[var4.gameObjectsCount] = null; + var4.gameObjects[var4.gameObjectsCount] = null; // L: 362 break; } } - var4.gameObjectsEdgeMask = 0; + var4.gameObjectsEdgeMask = 0; // L: 366 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369 } } } } - } + } // L: 374 - @ObfuscatedName("b") - public void method4214(int var1, int var2, int var3, int var4) { - 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; + @ObfuscatedName("n") + public void method4387(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 377 + if (var5 != null) { // L: 378 + WallDecoration var6 = var5.wallDecoration; // L: 379 + if (var6 != null) { // L: 380 + var6.xOffset = var4 * var6.xOffset / 16; // L: 381 + var6.yOffset = var4 * var6.yOffset / 16; // L: 382 } } - } - - @ObfuscatedName("x") - @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - var4.boundaryObject = null; - } - } - - @ObfuscatedName("p") - @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - var4.wallDecoration = null; - } - } + } // L: 383 @ObfuscatedName("z") + @Export("removeBoundaryObject") + public void removeBoundaryObject(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 386 + if (var4 != null) { + var4.boundaryObject = null; // L: 388 + } + } // L: 387 389 + + @ObfuscatedName("q") + @Export("removeWallDecoration") + public void removeWallDecoration(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 392 + if (var4 != null) { + var4.wallDecoration = null; // L: 394 + } + } // L: 393 395 + + @ObfuscatedName("d") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (class78.method2061(var6.tag) && var2 == var6.startX && var3 == var6.startY) { - this.removeGameObject(var6); - return; + Tile var4 = this.tiles[var1][var2][var3]; // L: 398 + if (var4 != null) { // L: 399 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400 + GameObject var6 = var4.gameObjects[var5]; // L: 401 + long var8 = var6.tag; // L: 403 + int var10 = (int)(var8 >>> 14 & 3L); // L: 407 + boolean var7 = var10 == 2; // L: 409 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 411 + this.removeGameObject(var6); // L: 412 + return; // L: 413 } } } - } - - @ObfuscatedName("h") - @Export("removeFloorDecoration") - public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - var4.floorDecoration = null; - } - } - - @ObfuscatedName("o") - @Export("removeGroundItemPile") - public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - var4.itemLayer = null; - } - } + } // L: 416 @ObfuscatedName("r") + @Export("removeFloorDecoration") + public void removeFloorDecoration(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 419 + if (var4 != null) { + var4.floorDecoration = null; // L: 421 + } + } // L: 420 422 + + @ObfuscatedName("m") + @Export("removeGroundItemPile") + public void removeGroundItemPile(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 425 + if (var4 != null) { + var4.itemLayer = null; // L: 427 + } + } // L: 426 428 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)Lhb;" + ) + public BoundaryObject method4301(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 431 + return var4 == null ? null : var4.boundaryObject; // L: 432 433 + } + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)Lhn;" ) - public BoundaryObject method4219(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.boundaryObject; + public WallDecoration method4410(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 437 + return var4 == null ? null : var4.wallDecoration; // L: 438 439 } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Lhk;" - ) - public WallDecoration method4316(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.wallDecoration; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(III)Lhw;" + descriptor = "(III)Lhv;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 443 + if (var4 == null) { // L: 444 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (class78.method2061(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 445 + GameObject var6 = var4.gameObjects[var5]; // L: 446 + long var8 = var6.tag; // L: 448 + int var10 = (int)(var8 >>> 14 & 3L); // L: 452 + boolean var7 = var10 == 2; // L: 454 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 456 return var6; } } - return null; + return null; // L: 458 } } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)Lgv;" + descriptor = "(III)Lgq;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; + Tile var4 = this.tiles[var1][var2][var3]; // L: 462 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 463 464 } - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 468 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 469 470 } - @ObfuscatedName("ad") + @ObfuscatedName("ae") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 474 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 475 476 } - @ObfuscatedName("as") + @ObfuscatedName("aq") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 480 + if (var4 == null) { // L: 481 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (class78.method2061(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 482 + GameObject var6 = var4.gameObjects[var5]; // L: 483 + long var8 = var6.tag; // L: 485 + int var10 = (int)(var8 >>> 14 & 3L); // L: 489 + boolean var7 = var10 == 2; // L: 491 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 493 return var6.tag; } } - return 0L; + return 0L; // L: 495 } } - @ObfuscatedName("ak") + @ObfuscatedName("al") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 499 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 500 501 } - @ObfuscatedName("ah") + @ObfuscatedName("am") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; - if (var6 == null) { + Tile var6 = this.tiles[var1][var2][var3]; // L: 505 + if (var6 == null) { // L: 506 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 507 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 508 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 509 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 510 + if (var6.gameObjects[var7].tag == var4) { // L: 511 return var6.gameObjects[var7].flags & 255; } } - return -1; + return -1; // L: 513 } } - @ObfuscatedName("ay") - public void method4228(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { - for (int var5 = 0; var5 < this.xSize; ++var5) { - for (int var6 = 0; var6 < this.ySize; ++var6) { - Tile var7 = this.tiles[var4][var5][var6]; - if (var7 != null) { - BoundaryObject var8 = var7.boundaryObject; + @ObfuscatedName("ai") + public void method4310(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 517 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 518 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 519 + Tile var7 = this.tiles[var4][var5][var6]; // L: 520 + if (var7 != null) { // L: 521 + BoundaryObject var8 = var7.boundaryObject; // L: 522 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { - ModelData var9 = (ModelData)var8.renderable1; - this.method4230(var9, var4, var5, var6, 1, 1); - if (var8.renderable2 instanceof ModelData) { - var10 = (ModelData)var8.renderable2; - this.method4230(var10, var4, var5, var6, 1, 1); - ModelData.method4043(var9, var10, 0, 0, 0, false); - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 523 + ModelData var9 = (ModelData)var8.renderable1; // L: 524 + this.method4325(var9, var4, var5, var6, 1, 1); // L: 525 + if (var8.renderable2 instanceof ModelData) { // L: 526 + var10 = (ModelData)var8.renderable2; // L: 527 + this.method4325(var10, var4, var5, var6, 1, 1); // L: 528 + ModelData.method4130(var9, var10, 0, 0, 0, false); // L: 529 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 532 } - 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.method4230(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); + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 534 + GameObject var14 = var7.gameObjects[var12]; // L: 535 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 536 + ModelData var11 = (ModelData)var14.renderable; // L: 537 + this.method4325(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 538 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 539 } } - FloorDecoration var13 = var7.floorDecoration; - if (var13 != null && var13.renderable instanceof ModelData) { - var10 = (ModelData)var13.renderable; - this.method4229(var10, var4, var5, var6); - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + FloorDecoration var13 = var7.floorDecoration; // L: 542 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 543 + var10 = (ModelData)var13.renderable; // L: 544 + this.method4311(var10, var4, var5, var6); // L: 545 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 546 } } } } } - } + } // L: 552 - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgi;III)V" + descriptor = "(Lgk;III)V" ) - void method4229(ModelData var1, int var2, int var3, int var4) { + void method4311(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { - var5 = this.tiles[var2][var3 + 1][var4]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method4043(var1, var6, 128, 0, 0, true); + if (var3 < this.xSize) { // L: 555 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 556 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 557 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 558 + ModelData.method4130(var1, var6, 128, 0, 0, true); // L: 559 } } - 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.method4043(var1, var6, 0, 0, 128, true); + if (var4 < this.xSize) { // L: 562 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 563 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 564 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 565 + ModelData.method4130(var1, var6, 0, 0, 128, true); // L: 566 } } - 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.method4043(var1, var6, 128, 0, 128, true); + if (var3 < this.xSize && var4 < this.ySize) { // L: 569 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 570 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 571 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 572 + ModelData.method4130(var1, var6, 128, 0, 128, true); // L: 573 } } - 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.method4043(var1, var6, 128, 0, -128, true); + if (var3 < this.xSize && var4 > 0) { // L: 576 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 577 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 578 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 579 + ModelData.method4130(var1, var6, 128, 0, -128, true); // L: 580 } } - } + } // L: 583 - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lgi;IIIII)V" + descriptor = "(Lgk;IIIII)V" ) - void method4230(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; - int var8 = var3; - int var9 = var3 + var5; - int var10 = var4 - 1; - int var11 = var4 + var6; + void method4325(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 586 + int var8 = var3; // L: 587 + int var9 = var3 + var5; // L: 588 + int var10 = var4 - 1; // L: 589 + int var11 = var4 + var6; // L: 590 - 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) { + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 591 + if (var12 != this.planes) { // L: 592 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 593 + if (var13 >= 0 && var13 < this.xSize) { // L: 594 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 595 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 596 597 + Tile var15 = this.tiles[var12][var13][var14]; // L: 598 + if (var15 != null) { // L: 599 + 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: 600 + BoundaryObject var17 = var15.boundaryObject; // L: 601 + if (var17 != null) { // L: 602 ModelData var18; - if (var17.renderable1 instanceof ModelData) { - var18 = (ModelData)var17.renderable1; - ModelData.method4043(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.renderable1 instanceof ModelData) { // L: 603 + var18 = (ModelData)var17.renderable1; // L: 604 + ModelData.method4130(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 605 } - if (var17.renderable2 instanceof ModelData) { - var18 = (ModelData)var17.renderable2; - ModelData.method4043(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.renderable2 instanceof ModelData) { // L: 607 + var18 = (ModelData)var17.renderable2; // L: 608 + ModelData.method4130(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 609 } } - 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.method4043(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 612 + GameObject var19 = var15.gameObjects[var23]; // L: 613 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 614 + ModelData var20 = (ModelData)var19.renderable; // L: 615 + int var21 = var19.endX - var19.startX + 1; // L: 616 + int var22 = var19.endY - var19.startY + 1; // L: 617 + ModelData.method4130(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 618 } } } @@ -962,179 +974,179 @@ public class Scene { } } - --var8; - var7 = false; + --var8; // L: 623 + var7 = false; // L: 624 } } - } + } // L: 626 - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; - if (var7 != null) { - SceneTilePaint var8 = var7.paint; + Tile var7 = this.tiles[var4][var5][var6]; // L: 629 + if (var7 != null) { // L: 630 + SceneTilePaint var8 = var7.paint; // L: 631 int var10; - 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; + if (var8 != null) { // L: 632 + int var18 = var8.rgb; // L: 633 + if (var18 != 0) { // L: 634 + for (var10 = 0; var10 < 4; ++var10) { // L: 635 + var1[var2] = var18; // L: 636 + var1[var2 + 1] = var18; // L: 637 + var1[var2 + 2] = var18; // L: 638 + var1[var2 + 3] = var18; // L: 639 + var2 += var3; // L: 640 } } } else { - 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; + SceneTileModel var9 = var7.model; // L: 644 + if (var9 != null) { // L: 645 + var10 = var9.shape; // L: 646 + int var11 = var9.rotation; // L: 647 + int var12 = var9.underlayRgb; // L: 648 + int var13 = var9.overlayRgb; // L: 649 + int[] var14 = this.tileShape2D[var10]; // L: 650 + int[] var15 = this.tileRotation2D[var11]; // L: 651 + int var16 = 0; // L: 652 int var17; - if (var12 != 0) { - for (var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; - var2 += var3; + if (var12 != 0) { // L: 653 + for (var17 = 0; var17 < 4; ++var17) { // L: 654 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 655 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 656 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 657 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 658 + var2 += var3; // L: 659 } } else { - for (var17 = 0; var17 < 4; ++var17) { - if (var14[var15[var16++]] != 0) { + for (var17 = 0; var17 < 4; ++var17) { // L: 663 + if (var14[var15[var16++]] != 0) { // L: 664 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 665 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 666 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 667 var1[var2 + 3] = var13; } - var2 += var3; + var2 += var3; // L: 668 } } } } } - } + } // L: 642 671 - @ObfuscatedName("aq") + @ObfuscatedName("ak") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { - checkClick = true; - viewportWalking = var4; - Scene_selectedPlane = var1; - Scene_selectedScreenX = var2; - Scene_selectedScreenY = var3; - Scene_selectedX = -1; - Scene_selectedY = -1; + if (!shouldSendWalk() || var4) { // L: 750 + checkClick = true; // L: 751 + viewportWalking = var4; // L: 752 + Scene_selectedPlane = var1; // L: 753 + Scene_selectedScreenX = var2; // L: 754 + Scene_selectedScreenY = var3; // L: 755 + Scene_selectedX = -1; // L: 756 + Scene_selectedY = -1; // L: 757 } - } + } // L: 758 - @ObfuscatedName("ar") + @ObfuscatedName("ab") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; - } + viewportWalking = true; // L: 761 + } // L: 762 - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { + if (var1 < 0) { // L: 774 var1 = 0; - } else if (var1 >= this.xSize * 128) { + } else if (var1 >= this.xSize * 128) { // L: 775 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { + if (var3 < 0) { // L: 776 var3 = 0; - } else if (var3 >= this.ySize * 128) { + } else if (var3 >= this.ySize * 128) { // L: 777 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { + if (var4 < 128) { // L: 778 var4 = 128; - } else if (var4 > 383) { + } else if (var4 > 383) { // L: 779 var4 = 383; } - ++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_drawnCount; // L: 780 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 781 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 782 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 783 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 784 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 785 + Scene_cameraX = var1; // L: 786 + Scene_cameraY = var2; // L: 787 + Scene_cameraZ = var3; // L: 788 + Scene_cameraXTile = var1 / 128; // L: 789 + Scene_cameraYTile = var3 / 128; // L: 790 + Scene_plane = var6; // L: 791 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 792 + if (Scene_cameraXTileMin < 0) { // L: 793 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; - if (Scene_cameraYTileMin < 0) { + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 794 + if (Scene_cameraYTileMin < 0) { // L: 795 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; - if (Scene_cameraXTileMax > this.xSize) { + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 796 + if (Scene_cameraXTileMax > this.xSize) { // L: 797 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; - if (Scene_cameraYTileMax > this.ySize) { + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 798 + if (Scene_cameraYTileMax > this.ySize) { // L: 799 Scene_cameraYTileMax = this.ySize; } - this.occlude(); - tileUpdateCount = 0; + this.occlude(); // L: 800 + tileUpdateCount = 0; // L: 801 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 802 + var8 = this.tiles[var7]; // L: 803 - 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) { + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 804 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 805 + Tile var16 = var8[var9][var10]; // L: 806 + if (var16 != null) { // L: 807 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 808 + var16.drawPrimary = true; // L: 814 + var16.drawSecondary = true; // L: 815 + if (var16.gameObjectsCount > 0) { // L: 816 var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; + var16.drawGameObjects = false; // L: 817 } - ++tileUpdateCount; + ++tileUpdateCount; // L: 818 } else { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; + var16.drawPrimary = false; // L: 809 + var16.drawSecondary = false; // L: 810 + var16.drawGameObjectEdges = 0; // L: 811 } } } @@ -1146,118 +1158,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 824 + var8 = this.tiles[var7]; // L: 825 - 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) { + for (var9 = -25; var9 <= 0; ++var9) { // L: 826 + var10 = var9 + Scene_cameraXTile; // L: 827 + var11 = Scene_cameraXTile - var9; // L: 828 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 829 + for (var12 = -25; var12 <= 0; ++var12) { // L: 830 + var13 = var12 + Scene_cameraYTile; // L: 831 + var14 = Scene_cameraYTile - var12; // L: 832 + if (var10 >= Scene_cameraXTileMin) { // L: 833 + if (var13 >= Scene_cameraYTileMin) { // L: 834 + var15 = var8[var10][var13]; // L: 835 + if (var15 != null && var15.drawPrimary) { // L: 836 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 838 + var15 = var8[var10][var14]; // L: 839 + if (var15 != null && var15.drawPrimary) { // L: 840 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var11][var13]; - if (var15 != null && var15.drawPrimary) { + if (var11 < Scene_cameraXTileMax) { // L: 843 + if (var13 >= Scene_cameraYTileMin) { // L: 844 + var15 = var8[var11][var13]; // L: 845 + if (var15 != null && var15.drawPrimary) { // L: 846 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var11][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 848 + var15 = var8[var11][var14]; // L: 849 + if (var15 != null && var15.drawPrimary) { // L: 850 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 853 + checkClick = false; // L: 854 + return; // L: 855 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 861 + var8 = this.tiles[var7]; // L: 862 - 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) { + for (var9 = -25; var9 <= 0; ++var9) { // L: 863 + var10 = var9 + Scene_cameraXTile; // L: 864 + var11 = Scene_cameraXTile - var9; // L: 865 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 866 + for (var12 = -25; var12 <= 0; ++var12) { // L: 867 + var13 = var12 + Scene_cameraYTile; // L: 868 + var14 = Scene_cameraYTile - var12; // L: 869 + if (var10 >= Scene_cameraXTileMin) { // L: 870 + if (var13 >= Scene_cameraYTileMin) { // L: 871 + var15 = var8[var10][var13]; // L: 872 + if (var15 != null && var15.drawPrimary) { // L: 873 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 875 + var15 = var8[var10][var14]; // L: 876 + if (var15 != null && var15.drawPrimary) { // L: 877 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var11][var13]; - if (var15 != null && var15.drawPrimary) { + if (var11 < Scene_cameraXTileMax) { // L: 880 + if (var13 >= Scene_cameraYTileMin) { // L: 881 + var15 = var8[var11][var13]; // L: 882 + if (var15 != null && var15.drawPrimary) { // L: 883 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var11][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 885 + var15 = var8[var11][var14]; // L: 886 + if (var15 != null && var15.drawPrimary) { // L: 887 this.drawTile(var15, false); } } } - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 890 + checkClick = false; // L: 891 + return; // L: 892 } } } } } - checkClick = false; - } + checkClick = false; // L: 898 + } // L: 899 - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lhz;Z)V" + descriptor = "(Lhm;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); + Scene_tilesDeque.addFirst(var1); // L: 902 while (true) { Tile var3; @@ -1289,227 +1301,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); - if (var3 == null) { + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 904 + if (var3 == null) { // L: 905 return; } - } while(!var3.drawSecondary); + } while(!var3.drawSecondary); // L: 906 - var4 = var3.x; - var5 = var3.y; - var6 = var3.plane; - var7 = var3.originalPlane; - var8 = this.tiles[var6]; - if (!var3.drawPrimary) { + var4 = var3.x; // L: 907 + var5 = var3.y; // L: 908 + var6 = var3.plane; // L: 909 + var7 = var3.originalPlane; // L: 910 + var8 = this.tiles[var6]; // L: 911 + if (!var3.drawPrimary) { // L: 912 break; } - if (var2) { - if (var6 > 0) { - var9 = this.tiles[var6 - 1][var4][var5]; - if (var9 != null && var9.drawSecondary) { + if (var2) { // L: 913 + if (var6 > 0) { // L: 914 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 915 + if (var9 != null && var9.drawSecondary) { // L: 916 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { - var9 = var8[var4 - 1][var5]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 918 + var9 = var8[var4 - 1][var5]; // L: 919 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 920 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { - var9 = var8[var4 + 1][var5]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 922 + var9 = var8[var4 + 1][var5]; // L: 923 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 924 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { - var9 = var8[var4][var5 - 1]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 926 + var9 = var8[var4][var5 - 1]; // L: 927 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 928 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { - var9 = var8[var4][var5 + 1]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 930 + var9 = var8[var4][var5 + 1]; // L: 931 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 932 continue; } } } else { - var2 = true; + var2 = true; // L: 935 } - var3.drawPrimary = false; - if (var3.linkedBelowTile != null) { - var9 = var3.linkedBelowTile; - if (var9.paint != null) { - if (!this.method4245(0, var4, var5)) { + var3.drawPrimary = false; // L: 936 + if (var3.linkedBelowTile != null) { // L: 937 + var9 = var3.linkedBelowTile; // L: 938 + if (var9.paint != null) { // L: 939 + if (!this.method4369(0, var4, var5)) { // L: 940 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4245(0, var4, var5)) { + } else if (var9.model != null && !this.method4369(0, var4, var5)) { // L: 942 943 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; - if (var10 != null) { + var10 = var9.boundaryObject; // L: 945 + if (var10 != null) { // L: 946 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) { - var12 = var9.gameObjects[var11]; - if (var12 != null) { + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 947 + var12 = var9.gameObjects[var11]; // L: 948 + if (var12 != null) { // L: 949 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; - if (var3.paint != null) { - if (!this.method4245(var7, var4, var5)) { - var20 = true; - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { + var20 = false; // L: 952 + if (var3.paint != null) { // L: 953 + if (!this.method4369(var7, var4, var5)) { // L: 954 + var20 = true; // L: 955 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 956 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4245(var7, var4, var5)) { - var20 = true; - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); + } else if (var3.model != null && !this.method4369(var7, var4, var5)) { // L: 959 960 + var20 = true; // L: 961 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 962 } - var21 = 0; - var11 = 0; - BoundaryObject var31 = var3.boundaryObject; - WallDecoration var13 = var3.wallDecoration; - if (var31 != null || var13 != null) { - if (var4 == Scene_cameraXTile) { + var21 = 0; // L: 965 + var11 = 0; // L: 966 + BoundaryObject var31 = var3.boundaryObject; // L: 967 + WallDecoration var13 = var3.wallDecoration; // L: 968 + if (var31 != null || var13 != null) { // L: 969 + if (var4 == Scene_cameraXTile) { // L: 970 ++var21; - } else if (Scene_cameraXTile < var4) { + } else if (Scene_cameraXTile < var4) { // L: 971 var21 += 2; } - if (var5 == Scene_cameraYTile) { + if (var5 == Scene_cameraYTile) { // L: 972 var21 += 3; - } else if (Scene_cameraYTile > var5) { + } else if (Scene_cameraYTile > var5) { // L: 973 var21 += 6; } - var11 = field2390[var21]; - var3.field2337 = field2425[var21]; + var11 = field2421[var21]; // L: 974 + var3.field2334 = field2423[var21]; // L: 975 } - if (var31 != null) { - if ((var31.orientationA & field2428[var21]) != 0) { - if (var31.orientationA == 16) { - var3.drawGameObjectEdges = 3; - var3.field2323 = field2419[var21]; - var3.field2336 = 3 - var3.field2323; - } else if (var31.orientationA == 32) { - var3.drawGameObjectEdges = 6; - var3.field2323 = field2433[var21]; - var3.field2336 = 6 - var3.field2323; - } else if (var31.orientationA == 64) { - var3.drawGameObjectEdges = 12; - var3.field2323 = field2420[var21]; - var3.field2336 = 12 - var3.field2323; + if (var31 != null) { // L: 977 + if ((var31.orientationA & field2422[var21]) != 0) { // L: 978 + if (var31.orientationA == 16) { // L: 979 + var3.drawGameObjectEdges = 3; // L: 980 + var3.field2328 = field2424[var21]; // L: 981 + var3.field2340 = 3 - var3.field2328; // L: 982 + } else if (var31.orientationA == 32) { // L: 984 + var3.drawGameObjectEdges = 6; // L: 985 + var3.field2328 = field2425[var21]; // L: 986 + var3.field2340 = 6 - var3.field2328; // L: 987 + } else if (var31.orientationA == 64) { // L: 989 + var3.drawGameObjectEdges = 12; // L: 990 + var3.field2328 = field2378[var21]; // L: 991 + var3.field2340 = 12 - var3.field2328; // L: 992 } else { - var3.drawGameObjectEdges = 9; - var3.field2323 = field2429[var21]; - var3.field2336 = 9 - var3.field2323; + var3.drawGameObjectEdges = 9; // L: 995 + var3.field2328 = field2376[var21]; // L: 996 + var3.field2340 = 9 - var3.field2328; // L: 997 } } else { - var3.drawGameObjectEdges = 0; + var3.drawGameObjectEdges = 0; // L: 1000 } - if ((var31.orientationA & var11) != 0 && !this.method4302(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method4328(var7, var4, var5, var31.orientationA)) { // L: 1001 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.method4302(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method4328(var7, var4, var5, var31.orientationB)) { // L: 1002 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.method4247(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; + if (var13 != null && !this.method4341(var7, var4, var5, var13.renderable1.height)) { // L: 1004 + if ((var13.orientation & var11) != 0) { // L: 1005 + 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: 1006 + } else if (var13.orientation == 256) { // L: 1008 + var14 = var13.x - Scene_cameraX; // L: 1009 + var15 = var13.tileHeight - Scene_cameraY; // L: 1010 + var16 = var13.y - Scene_cameraZ; // L: 1011 + var17 = var13.orientation2; // L: 1012 + if (var17 != 1 && var17 != 2) { // L: 1014 + var18 = var14; // L: 1015 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { - var19 = var16; + if (var17 != 2 && var17 != 3) { // L: 1017 + var19 = var16; // L: 1018 } else { var19 = -var16; } - 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 (var19 < var18) { // L: 1019 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1020 + } else if (var13.renderable2 != null) { // L: 1022 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1023 } } } - if (var20) { - FloorDecoration var22 = var3.floorDecoration; - if (var22 != null) { + if (var20) { // L: 1027 + FloorDecoration var22 = var3.floorDecoration; // L: 1028 + if (var22 != null) { // L: 1029 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; - if (var23 != null && var23.height == 0) { - if (var23.second != null) { + ItemLayer var23 = var3.itemLayer; // L: 1030 + if (var23 != null && var23.height == 0) { // L: 1031 + if (var23.second != null) { // L: 1032 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) { + if (var23.third != null) { // L: 1033 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) { + if (var23.first != null) { // L: 1034 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; - if (var14 != 0) { - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { - var36 = var8[var4 + 1][var5]; - if (var36 != null && var36.drawSecondary) { + var14 = var3.gameObjectsEdgeMask; // L: 1037 + if (var14 != 0) { // L: 1038 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1039 + var36 = var8[var4 + 1][var5]; // L: 1040 + if (var36 != null && var36.drawSecondary) { // L: 1041 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { - var36 = var8[var4][var5 + 1]; - if (var36 != null && var36.drawSecondary) { + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1043 + var36 = var8[var4][var5 + 1]; // L: 1044 + if (var36 != null && var36.drawSecondary) { // L: 1045 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { - var36 = var8[var4 - 1][var5]; - if (var36 != null && var36.drawSecondary) { + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1047 + var36 = var8[var4 - 1][var5]; // L: 1048 + if (var36 != null && var36.drawSecondary) { // L: 1049 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { - var36 = var8[var4][var5 - 1]; - if (var36 != null && var36.drawSecondary) { + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1051 + var36 = var8[var4][var5 - 1]; // L: 1052 + if (var36 != null && var36.drawSecondary) { // L: 1053 Scene_tilesDeque.addFirst(var36); } } @@ -1517,264 +1529,264 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { - var20 = true; + if (var3.drawGameObjectEdges != 0) { // L: 1057 + var20 = true; // L: 1058 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2323) { - var20 = false; - break; + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1059 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2328) { // L: 1060 + var20 = false; // L: 1061 + break; // L: 1062 } } - if (var20) { - var10 = var3.boundaryObject; - if (!this.method4302(var7, var4, var5, var10.orientationA)) { + if (var20) { // L: 1065 + var10 = var3.boundaryObject; // L: 1066 + if (!this.method4328(var7, var4, var5, var10.orientationA)) { // L: 1067 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; + var3.drawGameObjectEdges = 0; // L: 1068 } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1071 break; } try { - int var34 = var3.gameObjectsCount; - var3.drawGameObjects = false; - var21 = 0; + int var34 = var3.gameObjectsCount; // L: 1073 + var3.drawGameObjects = false; // L: 1074 + var21 = 0; // L: 1075 label563: - for (var11 = 0; var11 < var34; ++var11) { - var12 = var3.gameObjects[var11]; - if (var12.lastDrawn != Scene_drawnCount) { - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { - var36 = var8[var24][var14]; - if (var36.drawPrimary) { - var3.drawGameObjects = true; - continue label563; + for (var11 = 0; var11 < var34; ++var11) { // L: 1076 + var12 = var3.gameObjects[var11]; // L: 1077 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1078 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1079 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1080 + var36 = var8[var24][var14]; // L: 1081 + if (var36.drawPrimary) { // L: 1082 + var3.drawGameObjects = true; // L: 1083 + continue label563; // L: 1084 } - if (var36.drawGameObjectEdges != 0) { - var16 = 0; - if (var24 > var12.startX) { + if (var36.drawGameObjectEdges != 0) { // L: 1086 + var16 = 0; // L: 1087 + if (var24 > var12.startX) { // L: 1088 ++var16; } - if (var24 < var12.endX) { + if (var24 < var12.endX) { // L: 1089 var16 += 4; } - if (var14 > var12.startY) { + if (var14 > var12.startY) { // L: 1090 var16 += 8; } - if (var14 < var12.endY) { + if (var14 < var12.endY) { // L: 1091 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2336) { - var3.drawGameObjects = true; - continue label563; + if ((var16 & var36.drawGameObjectEdges) == var3.field2340) { // L: 1092 + var3.drawGameObjects = true; // L: 1093 + continue label563; // L: 1094 } } } } - gameObjects[var21++] = var12; - var24 = Scene_cameraXTile - var12.startX; - var14 = var12.endX - Scene_cameraXTile; - if (var14 > var24) { + gameObjects[var21++] = var12; // L: 1099 + var24 = Scene_cameraXTile - var12.startX; // L: 1100 + var14 = var12.endX - Scene_cameraXTile; // L: 1101 + if (var14 > var24) { // L: 1102 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; - var16 = var12.endY - Scene_cameraYTile; - if (var16 > var15) { - var12.field2637 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1103 + var16 = var12.endY - Scene_cameraYTile; // L: 1104 + if (var16 > var15) { // L: 1105 + var12.field2641 = var24 + var16; } else { - var12.field2637 = var24 + var15; + var12.field2641 = var24 + var15; // L: 1106 } } } - while (var21 > 0) { - var11 = -50; - var25 = -1; + while (var21 > 0) { // L: 1109 + var11 = -50; // L: 1110 + var25 = -1; // L: 1111 - for (var24 = 0; var24 < var21; ++var24) { - GameObject var35 = gameObjects[var24]; - if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2637 > var11) { - var11 = var35.field2637; - var25 = var24; - } else if (var11 == var35.field2637) { - 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) { + for (var24 = 0; var24 < var21; ++var24) { // L: 1112 + GameObject var35 = gameObjects[var24]; // L: 1113 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1114 + if (var35.field2641 > var11) { // L: 1115 + var11 = var35.field2641; // L: 1116 + var25 = var24; // L: 1117 + } else if (var11 == var35.field2641) { // L: 1119 + var15 = var35.centerX - Scene_cameraX; // L: 1120 + var16 = var35.centerY - Scene_cameraZ; // L: 1121 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1122 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1123 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1124 var25 = var24; } } } } - if (var25 == -1) { + if (var25 == -1) { // L: 1128 break; } - GameObject var33 = gameObjects[var25]; - var33.lastDrawn = Scene_drawnCount; - if (!this.method4263(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); + GameObject var33 = gameObjects[var25]; // L: 1129 + var33.lastDrawn = Scene_drawnCount; // L: 1130 + if (!this.method4330(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1131 + 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: 1132 } - 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) { + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1134 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1135 + Tile var26 = var8[var14][var15]; // L: 1136 + if (var26.drawGameObjectEdges != 0) { // L: 1137 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1138 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1142 break; } - } catch (Exception var28) { - var3.drawGameObjects = false; + } catch (Exception var28) { // L: 1144 + var3.drawGameObjects = false; // L: 1145 break; } } - } while(!var3.drawSecondary); - } while(var3.drawGameObjectEdges != 0); + } while(!var3.drawSecondary); // L: 1148 + } while(var3.drawGameObjectEdges != 0); // L: 1149 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1150 break; } - var9 = var8[var4 - 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 - 1][var5]; // L: 1151 + } while(var9 != null && var9.drawSecondary); // L: 1152 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1154 break; } - var9 = var8[var4 + 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 + 1][var5]; // L: 1155 + } while(var9 != null && var9.drawSecondary); // L: 1156 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1158 break; } - var9 = var8[var4][var5 - 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 - 1]; // L: 1159 + } while(var9 != null && var9.drawSecondary); // L: 1160 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1162 break; } - var9 = var8[var4][var5 + 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 + 1]; // L: 1163 + } while(var9 != null && var9.drawSecondary); // L: 1164 - var3.drawSecondary = false; - --tileUpdateCount; - ItemLayer var32 = var3.itemLayer; - if (var32 != null && var32.height != 0) { - if (var32.second != null) { + var3.drawSecondary = false; // L: 1166 + --tileUpdateCount; // L: 1167 + ItemLayer var32 = var3.itemLayer; // L: 1168 + if (var32 != null && var32.height != 0) { // L: 1169 + if (var32.second != null) { // L: 1170 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) { + if (var32.third != null) { // L: 1171 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) { + if (var32.first != null) { // L: 1172 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.field2337 != 0) { - WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method4247(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field2337) != 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; + if (var3.field2334 != 0) { // L: 1174 + WallDecoration var29 = var3.wallDecoration; // L: 1175 + if (var29 != null && !this.method4341(var7, var4, var5, var29.renderable1.height)) { // L: 1176 + if ((var29.orientation & var3.field2334) != 0) { // L: 1177 + 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: 1178 + } else if (var29.orientation == 256) { // L: 1180 + var11 = var29.x - Scene_cameraX; // L: 1181 + var25 = var29.tileHeight - Scene_cameraY; // L: 1182 + var24 = var29.y - Scene_cameraZ; // L: 1183 + var14 = var29.orientation2; // L: 1184 + if (var14 != 1 && var14 != 2) { // L: 1186 + var15 = var11; // L: 1187 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { - var16 = var24; + if (var14 != 2 && var14 != 3) { // L: 1189 + var16 = var24; // L: 1190 } else { var16 = -var24; } - 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); + if (var16 >= var15) { // L: 1191 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1192 + } else if (var29.renderable2 != null) { // L: 1194 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1195 } } } - BoundaryObject var27 = var3.boundaryObject; - if (var27 != null) { - if ((var27.orientationB & var3.field2337) != 0 && !this.method4302(var7, var4, var5, var27.orientationB)) { + BoundaryObject var27 = var3.boundaryObject; // L: 1199 + if (var27 != null) { // L: 1200 + if ((var27.orientationB & var3.field2334) != 0 && !this.method4328(var7, var4, var5, var27.orientationB)) { // L: 1201 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.field2337) != 0 && !this.method4302(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2334) != 0 && !this.method4328(var7, var4, var5, var27.orientationA)) { // L: 1202 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) { - var30 = this.tiles[var6 + 1][var4][var5]; - if (var30 != null && var30.drawSecondary) { + if (var6 < this.planes - 1) { // L: 1205 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1206 + if (var30 != null && var30.drawSecondary) { // L: 1207 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { - var30 = var8[var4 + 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 < Scene_cameraXTile) { // L: 1209 + var30 = var8[var4 + 1][var5]; // L: 1210 + if (var30 != null && var30.drawSecondary) { // L: 1211 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { - var30 = var8[var4][var5 + 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 < Scene_cameraYTile) { // L: 1213 + var30 = var8[var4][var5 + 1]; // L: 1214 + if (var30 != null && var30.drawSecondary) { // L: 1215 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { - var30 = var8[var4 - 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 > Scene_cameraXTile) { // L: 1217 + var30 = var8[var4 - 1][var5]; // L: 1218 + if (var30 != null && var30.drawSecondary) { // L: 1219 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { - var30 = var8[var4][var5 - 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 > Scene_cameraYTile) { // L: 1221 + var30 = var8[var4][var5 - 1]; // L: 1222 + if (var30 != null && var30.drawSecondary) { // L: 1223 Scene_tilesDeque.addFirst(var30); } } @@ -1783,106 +1795,106 @@ public class Scene { @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lhm;IIIIIII)V" + descriptor = "(Lhg;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1231 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1233 int var13; - int var14 = var13 = var10 + 128; + int var14 = var13 = var10 + 128; // L: 1235 int var15; - int var16 = var15 = var12 + 128; - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; - 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 var16 = var15 = var12 + 128; // L: 1237 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1238 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1239 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1240 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1241 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1242 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1243 + var10 = var21; // L: 1244 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1245 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1246 + var17 = var21; // L: 1247 + if (var12 >= 50) { // L: 1248 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1249 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1250 + var14 = var21; // L: 1251 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1252 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1253 + var18 = var21; // L: 1254 + if (var11 >= 50) { // L: 1255 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1256 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1257 + var13 = var21; // L: 1258 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1259 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1260 + var19 = var21; // L: 1261 + if (var16 >= 50) { // L: 1262 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1263 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1264 + var9 = var21; // L: 1265 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1266 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1267 + if (var15 >= 50) { // L: 1269 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1270 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1271 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1272 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1273 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1274 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1275 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1276 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1277 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1278 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field2347 = false; - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2347 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1279 + Rasterizer3D.field2365 = false; // L: 1280 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1281 + Rasterizer3D.field2365 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { - Scene_selectedX = var7; - Scene_selectedY = var8; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1282 + Scene_selectedX = var7; // L: 1283 + Scene_selectedY = var8; // L: 1284 } - if (var1.texture == -1) { - if (var1.neColor != 12345678) { - Rasterizer3D.method4128(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1286 + if (var1.neColor != 12345678) { // L: 1287 + Rasterizer3D.method4211(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { - if (var1.isFlat) { + } else if (!Scene_isLowDetail) { // L: 1289 + if (var1.isFlat) { // L: 1290 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); + 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: 1291 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method4128(var27, var29, var25, var26, var28, var24, method4242(var30, var1.neColor), method4242(var30, var1.nwColor), method4242(var30, var1.seColor)); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1294 + Rasterizer3D.method4211(var27, var29, var25, var26, var28, var24, method4324(var30, var1.neColor), method4324(var30, var1.nwColor), method4324(var30, var1.seColor)); // L: 1295 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field2347 = false; - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2347 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1298 + Rasterizer3D.field2365 = false; // L: 1299 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1300 + Rasterizer3D.field2365 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { - Scene_selectedX = var7; - Scene_selectedY = var8; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1301 + Scene_selectedX = var7; // L: 1302 + Scene_selectedY = var8; // L: 1303 } - if (var1.texture == -1) { - if (var1.swColor != 12345678) { - Rasterizer3D.method4128(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1305 + if (var1.swColor != 12345678) { // L: 1306 + Rasterizer3D.method4211(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + } else if (!Scene_isLowDetail) { // L: 1308 + 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: 1309 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method4128(var23, var25, var29, var22, var24, var28, method4242(var30, var1.swColor), method4242(var30, var1.seColor), method4242(var30, var1.nwColor)); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1312 + Rasterizer3D.method4211(var23, var25, var29, var22, var24, var28, method4324(var30, var1.swColor), method4324(var30, var1.seColor), method4324(var30, var1.nwColor)); // L: 1313 } } @@ -1890,566 +1902,566 @@ public class Scene { } } } - } + } // L: 1316 @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lhr;IIIIII)V" + descriptor = "(Lhs;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; + int var8 = var1.vertexX.length; // L: 1319 int var9; int var10; int var11; int var12; int var13; - 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) { + for (var9 = 0; var9 < var8; ++var9) { // L: 1320 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1321 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1322 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1323 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1324 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1325 + var10 = var13; // L: 1326 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1327 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1328 + if (var12 < 50) { // L: 1330 return; } - if (var1.triangleTextureId != null) { - SceneTileModel.field2499[var9] = var10; - SceneTileModel.field2500[var9] = var13; - SceneTileModel.field2484[var9] = var12; + if (var1.triangleTextureId != null) { // L: 1331 + SceneTileModel.field2503[var9] = var10; // L: 1332 + SceneTileModel.field2504[var9] = var13; // L: 1333 + SceneTileModel.field2502[var9] = var12; // L: 1334 } - SceneTileModel.field2497[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - SceneTileModel.field2498[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + SceneTileModel.field2501[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1336 + SceneTileModel.field2488[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1337 } - Rasterizer3D.Rasterizer3D_alpha = 0; - var8 = var1.faceX.length; + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1339 + var8 = var1.faceX.length; // L: 1340 - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.faceX[var9]; - var11 = var1.faceY[var9]; - var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2497[var10]; - int var14 = SceneTileModel.field2497[var11]; - int var15 = SceneTileModel.field2497[var12]; - int var16 = SceneTileModel.field2498[var10]; - int var17 = SceneTileModel.field2498[var11]; - int var18 = SceneTileModel.field2498[var12]; - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field2347 = false; - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2347 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1341 + var10 = var1.faceX[var9]; // L: 1342 + var11 = var1.faceY[var9]; // L: 1343 + var12 = var1.faceZ[var9]; // L: 1344 + var13 = SceneTileModel.field2501[var10]; // L: 1345 + int var14 = SceneTileModel.field2501[var11]; // L: 1346 + int var15 = SceneTileModel.field2501[var12]; // L: 1347 + int var16 = SceneTileModel.field2488[var10]; // L: 1348 + int var17 = SceneTileModel.field2488[var11]; // L: 1349 + int var18 = SceneTileModel.field2488[var12]; // L: 1350 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1351 + Rasterizer3D.field2365 = false; // L: 1352 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1353 + Rasterizer3D.field2365 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { - Scene_selectedX = var6; - Scene_selectedY = var7; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1354 + Scene_selectedX = var6; // L: 1355 + Scene_selectedY = var7; // L: 1356 } - 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.field2499[0], SceneTileModel.field2499[1], SceneTileModel.field2499[3], SceneTileModel.field2500[0], SceneTileModel.field2500[1], SceneTileModel.field2500[3], SceneTileModel.field2484[0], SceneTileModel.field2484[1], SceneTileModel.field2484[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1358 + if (!Scene_isLowDetail) { // L: 1362 + if (var1.isFlat) { // L: 1363 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2503[0], SceneTileModel.field2503[1], SceneTileModel.field2503[3], SceneTileModel.field2504[0], SceneTileModel.field2504[1], SceneTileModel.field2504[3], SceneTileModel.field2502[0], SceneTileModel.field2502[1], SceneTileModel.field2502[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2499[var10], SceneTileModel.field2499[var11], SceneTileModel.field2499[var12], SceneTileModel.field2500[var10], SceneTileModel.field2500[var11], SceneTileModel.field2500[var12], SceneTileModel.field2484[var10], SceneTileModel.field2484[var11], SceneTileModel.field2484[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2503[var10], SceneTileModel.field2503[var11], SceneTileModel.field2503[var12], SceneTileModel.field2504[var10], SceneTileModel.field2504[var11], SceneTileModel.field2504[var12], SceneTileModel.field2502[var10], SceneTileModel.field2502[var11], SceneTileModel.field2502[var12], var1.triangleTextureId[var9]); // L: 1364 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method4128(var16, var17, var18, var13, var14, var15, method4242(var19, var1.triangleColorA[var9]), method4242(var19, var1.triangleColorB[var9]), method4242(var19, var1.triangleColorC[var9])); + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1367 + Rasterizer3D.method4211(var16, var17, var18, var13, var14, var15, method4324(var19, var1.triangleColorA[var9]), method4324(var19, var1.triangleColorB[var9]), method4324(var19, var1.triangleColorC[var9])); // L: 1368 } - } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method4128(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1359 + Rasterizer3D.method4211(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } + } // L: 1373 - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; - Scene_currentOccludersCount = 0; + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1400 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1401 + Scene_currentOccludersCount = 0; // L: 1402 - for (int var3 = 0; var3 < var1; ++var3) { - Occluder var4 = var2[var3]; + for (int var3 = 0; var3 < var1; ++var3) { // L: 1403 + Occluder var4 = var2[var3]; // L: 1404 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { - var5 = var4.minTileX - Scene_cameraXTile + 25; - if (var5 >= 0 && var5 <= 50) { - var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { + if (var4.type == 1) { // L: 1405 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1406 + if (var5 >= 0 && var5 <= 50) { // L: 1407 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1408 + if (var6 < 0) { // L: 1409 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1410 + if (var7 > 50) { // L: 1411 var7 = 50; } - var13 = false; + var13 = false; // L: 1412 - while (var6 <= var7) { - if (visibleTiles[var5][var6++]) { - var13 = true; + while (var6 <= var7) { // L: 1413 + if (visibleTiles[var5][var6++]) { // L: 1414 + var13 = true; // L: 1415 break; } } - if (var13) { - var9 = Scene_cameraX - var4.minX; - if (var9 > 32) { - var4.field2466 = 1; + if (var13) { // L: 1419 + var9 = Scene_cameraX - var4.minX; // L: 1420 + if (var9 > 32) { // L: 1421 + var4.field2464 = 1; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1422 continue; } - var4.field2466 = 2; - var9 = -var9; + var4.field2464 = 2; // L: 1423 + var9 = -var9; // L: 1424 } - var4.field2469 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2463 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field2471 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1427 + var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1428 + var4.field2473 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1429 + var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1430 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1431 } } - } 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) { + } else if (var4.type == 2) { // L: 1434 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1435 + if (var5 >= 0 && var5 <= 50) { // L: 1436 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1437 + if (var6 < 0) { // L: 1438 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; - if (var7 > 50) { + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1439 + if (var7 > 50) { // L: 1440 var7 = 50; } - var13 = false; + var13 = false; // L: 1441 - while (var6 <= var7) { - if (visibleTiles[var6++][var5]) { - var13 = true; + while (var6 <= var7) { // L: 1442 + if (visibleTiles[var6++][var5]) { // L: 1443 + var13 = true; // L: 1444 break; } } - if (var13) { - var9 = Scene_cameraZ - var4.minZ; - if (var9 > 32) { - var4.field2466 = 3; + if (var13) { // L: 1448 + var9 = Scene_cameraZ - var4.minZ; // L: 1449 + if (var9 > 32) { // L: 1450 + var4.field2464 = 3; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1451 continue; } - var4.field2466 = 4; - var9 = -var9; + var4.field2464 = 4; // L: 1452 + var9 = -var9; // L: 1453 } - var4.field2467 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2468 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2463 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field2469 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1456 + var4.field2463 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1457 + var4.field2473 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1458 + var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1459 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1460 } } - } else if (var4.type == 4) { - var5 = var4.minY - Scene_cameraY; - if (var5 > 128) { - var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { + } else if (var4.type == 4) { // L: 1463 + var5 = var4.minY - Scene_cameraY; // L: 1464 + if (var5 > 128) { // L: 1465 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1466 + if (var6 < 0) { // L: 1467 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1468 + if (var7 > 50) { // L: 1469 var7 = 50; } - if (var6 <= var7) { - int var8 = var4.minTileX - Scene_cameraXTile + 25; - if (var8 < 0) { + if (var6 <= var7) { // L: 1470 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1471 + if (var8 < 0) { // L: 1472 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; - if (var9 > 50) { + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1473 + if (var9 > 50) { // L: 1474 var9 = 50; } - boolean var10 = false; + boolean var10 = false; // L: 1475 label150: - for (int var11 = var8; var11 <= var9; ++var11) { - for (int var12 = var6; var12 <= var7; ++var12) { - if (visibleTiles[var11][var12]) { - var10 = true; + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1476 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1477 + if (visibleTiles[var11][var12]) { // L: 1478 + var10 = true; // L: 1479 break label150; } } } - if (var10) { - var4.field2466 = 5; - var4.field2467 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2468 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2469 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var5; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + if (var10) { // L: 1484 + var4.field2464 = 5; // L: 1485 + var4.field2469 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1486 + var4.field2463 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1487 + var4.field2471 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1488 + var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1489 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1490 } } } } } - } + } // L: 1494 - @ObfuscatedName("az") - boolean method4245(int var1, int var2, int var3) { - int var4 = this.field2439[var1][var2][var3]; - if (var4 == -Scene_drawnCount) { + @ObfuscatedName("aw") + boolean method4369(int var1, int var2, int var3) { + int var4 = this.field2409[var1][var2][var3]; // L: 1497 + if (var4 == -Scene_drawnCount) { // L: 1498 return false; - } else if (var4 == Scene_drawnCount) { + } else if (var4 == Scene_drawnCount) { // L: 1499 return true; } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - if (this.method4249(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4249(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4249(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4249(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2439[var1][var2][var3] = Scene_drawnCount; - return true; + int var5 = var2 << 7; // L: 1500 + int var6 = var3 << 7; // L: 1501 + if (this.method4331(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4331(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1502 + this.field2409[var1][var2][var3] = Scene_drawnCount; // L: 1503 + return true; // L: 1504 } else { - this.field2439[var1][var2][var3] = -Scene_drawnCount; - return false; + this.field2409[var1][var2][var3] = -Scene_drawnCount; // L: 1507 + return false; // L: 1508 } } } - @ObfuscatedName("ae") - boolean method4302(int var1, int var2, int var3, int var4) { - if (!this.method4245(var1, var2, var3)) { + @ObfuscatedName("ao") + boolean method4328(int var1, int var2, int var3, int var4) { + if (!this.method4369(var1, var2, var3)) { // L: 1513 return false; } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - int var7 = this.tileHeights[var1][var2][var3] - 1; - int var8 = var7 - 120; - int var9 = var7 - 230; - int var10 = var7 - 238; - if (var4 < 16) { - if (var4 == 1) { - if (var5 > Scene_cameraX) { - if (!this.method4249(var5, var7, var6)) { + int var5 = var2 << 7; // L: 1514 + int var6 = var3 << 7; // L: 1515 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1516 + int var8 = var7 - 120; // L: 1517 + int var9 = var7 - 230; // L: 1518 + int var10 = var7 - 238; // L: 1519 + if (var4 < 16) { // L: 1520 + if (var4 == 1) { // L: 1521 + if (var5 > Scene_cameraX) { // L: 1522 + if (!this.method4331(var5, var7, var6)) { // L: 1523 return false; } - if (!this.method4249(var5, var7, var6 + 128)) { + if (!this.method4331(var5, var7, var6 + 128)) { // L: 1524 return false; } } - if (var1 > 0) { - if (!this.method4249(var5, var8, var6)) { + if (var1 > 0) { // L: 1526 + if (!this.method4331(var5, var8, var6)) { // L: 1527 return false; } - if (!this.method4249(var5, var8, var6 + 128)) { + if (!this.method4331(var5, var8, var6 + 128)) { // L: 1528 return false; } } - if (!this.method4249(var5, var9, var6)) { + if (!this.method4331(var5, var9, var6)) { // L: 1530 return false; } - if (!this.method4249(var5, var9, var6 + 128)) { + if (!this.method4331(var5, var9, var6 + 128)) { // L: 1531 return false; } - return true; + return true; // L: 1532 } - if (var4 == 2) { - if (var6 < Scene_cameraZ) { - if (!this.method4249(var5, var7, var6 + 128)) { + if (var4 == 2) { // L: 1534 + if (var6 < Scene_cameraZ) { // L: 1535 + if (!this.method4331(var5, var7, var6 + 128)) { // L: 1536 return false; } - if (!this.method4249(var5 + 128, var7, var6 + 128)) { + if (!this.method4331(var5 + 128, var7, var6 + 128)) { // L: 1537 return false; } } - if (var1 > 0) { - if (!this.method4249(var5, var8, var6 + 128)) { + if (var1 > 0) { // L: 1539 + if (!this.method4331(var5, var8, var6 + 128)) { // L: 1540 return false; } - if (!this.method4249(var5 + 128, var8, var6 + 128)) { + if (!this.method4331(var5 + 128, var8, var6 + 128)) { // L: 1541 return false; } } - if (!this.method4249(var5, var9, var6 + 128)) { + if (!this.method4331(var5, var9, var6 + 128)) { // L: 1543 return false; } - if (!this.method4249(var5 + 128, var9, var6 + 128)) { + if (!this.method4331(var5 + 128, var9, var6 + 128)) { // L: 1544 return false; } - return true; + return true; // L: 1545 } - if (var4 == 4) { - if (var5 < Scene_cameraX) { - if (!this.method4249(var5 + 128, var7, var6)) { + if (var4 == 4) { // L: 1547 + if (var5 < Scene_cameraX) { // L: 1548 + if (!this.method4331(var5 + 128, var7, var6)) { // L: 1549 return false; } - if (!this.method4249(var5 + 128, var7, var6 + 128)) { + if (!this.method4331(var5 + 128, var7, var6 + 128)) { // L: 1550 return false; } } - if (var1 > 0) { - if (!this.method4249(var5 + 128, var8, var6)) { + if (var1 > 0) { // L: 1552 + if (!this.method4331(var5 + 128, var8, var6)) { // L: 1553 return false; } - if (!this.method4249(var5 + 128, var8, var6 + 128)) { + if (!this.method4331(var5 + 128, var8, var6 + 128)) { // L: 1554 return false; } } - if (!this.method4249(var5 + 128, var9, var6)) { + if (!this.method4331(var5 + 128, var9, var6)) { // L: 1556 return false; } - if (!this.method4249(var5 + 128, var9, var6 + 128)) { + if (!this.method4331(var5 + 128, var9, var6 + 128)) { // L: 1557 return false; } - return true; + return true; // L: 1558 } - if (var4 == 8) { - if (var6 > Scene_cameraZ) { - if (!this.method4249(var5, var7, var6)) { + if (var4 == 8) { // L: 1560 + if (var6 > Scene_cameraZ) { // L: 1561 + if (!this.method4331(var5, var7, var6)) { // L: 1562 return false; } - if (!this.method4249(var5 + 128, var7, var6)) { + if (!this.method4331(var5 + 128, var7, var6)) { // L: 1563 return false; } } - if (var1 > 0) { - if (!this.method4249(var5, var8, var6)) { + if (var1 > 0) { // L: 1565 + if (!this.method4331(var5, var8, var6)) { // L: 1566 return false; } - if (!this.method4249(var5 + 128, var8, var6)) { + if (!this.method4331(var5 + 128, var8, var6)) { // L: 1567 return false; } } - if (!this.method4249(var5, var9, var6)) { + if (!this.method4331(var5, var9, var6)) { // L: 1569 return false; } - if (!this.method4249(var5 + 128, var9, var6)) { + if (!this.method4331(var5 + 128, var9, var6)) { // L: 1570 return false; } - return true; + return true; // L: 1571 } } - if (!this.method4249(var5 + 64, var10, var6 + 64)) { + if (!this.method4331(var5 + 64, var10, var6 + 64)) { // L: 1574 return false; - } else if (var4 == 16) { - return this.method4249(var5, var9, var6 + 128); - } else if (var4 == 32) { - return this.method4249(var5 + 128, var9, var6 + 128); - } else if (var4 == 64) { - return this.method4249(var5 + 128, var9, var6); - } else if (var4 == 128) { - return this.method4249(var5, var9, var6); + } else if (var4 == 16) { // L: 1575 + return this.method4331(var5, var9, var6 + 128); // L: 1576 + } else if (var4 == 32) { // L: 1579 + return this.method4331(var5 + 128, var9, var6 + 128); // L: 1580 + } else if (var4 == 64) { // L: 1583 + return this.method4331(var5 + 128, var9, var6); // L: 1584 + } else if (var4 == 128) { // L: 1587 + return this.method4331(var5, var9, var6); // L: 1588 } else { - return true; + return true; // L: 1591 } } } - @ObfuscatedName("ai") - boolean method4247(int var1, int var2, int var3, int var4) { - if (!this.method4245(var1, var2, var3)) { + @ObfuscatedName("aa") + boolean method4341(int var1, int var2, int var3, int var4) { + if (!this.method4369(var1, var2, var3)) { // L: 1595 return false; } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - return this.method4249(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4249(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4249(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4249(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + int var5 = var2 << 7; // L: 1596 + int var6 = var3 << 7; // L: 1597 + return this.method4331(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4331(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1598 + } + } + + @ObfuscatedName("ay") + boolean method4330(int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + int var8; + if (var3 == var2 && var5 == var4) { // L: 1603 + if (!this.method4369(var1, var2, var4)) { // L: 1604 + return false; + } else { + var7 = var2 << 7; // L: 1605 + var8 = var4 << 7; // L: 1606 + return this.method4331(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4331(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1607 + } + } else { + for (var7 = var2; var7 <= var3; ++var7) { // L: 1610 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1611 + if (this.field2409[var1][var7][var8] == -Scene_drawnCount) { // L: 1612 + return false; + } + } + } + + var7 = (var2 << 7) + 1; // L: 1615 + var8 = (var4 << 7) + 2; // L: 1616 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1617 + if (!this.method4331(var7, var9, var8)) { // L: 1618 + return false; + } else { + int var10 = (var3 << 7) - 1; // L: 1619 + if (!this.method4331(var10, var9, var8)) { // L: 1620 + return false; + } else { + int var11 = (var5 << 7) - 1; // L: 1621 + if (!this.method4331(var7, var9, var11)) { // L: 1622 + return false; + } else if (!this.method4331(var10, var9, var11)) { // L: 1623 + return false; + } else { + return true; // L: 1624 + } + } + } } } @ObfuscatedName("bg") - boolean method4263(int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - int var8; - if (var3 == var2 && var5 == var4) { - if (!this.method4245(var1, var2, var4)) { - return false; - } else { - var7 = var2 << 7; - var8 = var4 << 7; - return this.method4249(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4249(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4249(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4249(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); - } - } else { - for (var7 = var2; var7 <= var3; ++var7) { - for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2439[var1][var7][var8] == -Scene_drawnCount) { - return false; - } - } - } - - var7 = (var2 << 7) + 1; - var8 = (var4 << 7) + 2; - int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method4249(var7, var9, var8)) { - return false; - } else { - int var10 = (var3 << 7) - 1; - if (!this.method4249(var10, var9, var8)) { - return false; - } else { - int var11 = (var5 << 7) - 1; - if (!this.method4249(var7, var9, var11)) { - return false; - } else if (!this.method4249(var10, var9, var11)) { - return false; - } else { - return true; - } - } - } - } - } - - @ObfuscatedName("bf") - boolean method4249(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { - Occluder var5 = Scene_currentOccluders[var4]; + boolean method4331(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1628 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1629 int var6; int var7; int var8; int var9; int var10; - if (var5.field2466 == 1) { - var6 = var5.minX - var1; - if (var6 > 0) { - var7 = (var6 * var5.field2469 >> 8) + var5.minZ; - var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2463 >> 8) + var5.minY; - var10 = (var6 * var5.field2472 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + if (var5.field2464 == 1) { // L: 1630 + var6 = var5.minX - var1; // L: 1631 + if (var6 > 0) { // L: 1632 + var7 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1633 + var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1634 + var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1635 + var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1636 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1637 return true; } } - } else if (var5.field2466 == 2) { - var6 = var1 - var5.minX; - if (var6 > 0) { - var7 = (var6 * var5.field2469 >> 8) + var5.minZ; - var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2463 >> 8) + var5.minY; - var10 = (var6 * var5.field2472 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2464 == 2) { // L: 1641 + var6 = var1 - var5.minX; // L: 1642 + if (var6 > 0) { // L: 1643 + var7 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1644 + var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1645 + var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1646 + var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1647 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1648 return true; } } - } else if (var5.field2466 == 3) { - var6 = var5.minZ - var3; - if (var6 > 0) { - var7 = (var6 * var5.field2467 >> 8) + var5.minX; - var8 = (var6 * var5.field2468 >> 8) + var5.maxX; - var9 = (var6 * var5.field2463 >> 8) + var5.minY; - var10 = (var6 * var5.field2472 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2464 == 3) { // L: 1652 + var6 = var5.minZ - var3; // L: 1653 + if (var6 > 0) { // L: 1654 + var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1655 + var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1656 + var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1657 + var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1658 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1659 return true; } } - } else if (var5.field2466 == 4) { - var6 = var3 - var5.minZ; - if (var6 > 0) { - var7 = (var6 * var5.field2467 >> 8) + var5.minX; - var8 = (var6 * var5.field2468 >> 8) + var5.maxX; - var9 = (var6 * var5.field2463 >> 8) + var5.minY; - var10 = (var6 * var5.field2472 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2464 == 4) { // L: 1663 + var6 = var3 - var5.minZ; // L: 1664 + if (var6 > 0) { // L: 1665 + var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1666 + var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1667 + var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1668 + var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1669 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1670 return true; } } - } else if (var5.field2466 == 5) { - var6 = var2 - var5.minY; - if (var6 > 0) { - var7 = (var6 * var5.field2467 >> 8) + var5.minX; - var8 = (var6 * var5.field2468 >> 8) + var5.maxX; - var9 = (var6 * var5.field2469 >> 8) + var5.minZ; - var10 = (var6 * var5.field2470 >> 8) + var5.maxZ; - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { + } else if (var5.field2464 == 5) { // L: 1674 + var6 = var2 - var5.minY; // L: 1675 + if (var6 > 0) { // L: 1676 + var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1677 + var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1678 + var9 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1679 + var10 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1680 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1681 return true; } } } } - return false; + return false; // L: 1686 } - @ObfuscatedName("j") + @ObfuscatedName("a") @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(); - 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; - } + Occluder var8 = new Occluder(); // L: 158 + var8.minTileX = var2 / 128; // L: 159 + var8.maxTileX = var3 / 128; // L: 160 + var8.minTileY = var4 / 128; // L: 161 + var8.maxTileY = var5 / 128; // L: 162 + var8.type = var1; // L: 163 + var8.minX = var2; // L: 164 + var8.maxX = var3; // L: 165 + var8.minZ = var4; // L: 166 + var8.maxZ = var5; // L: 167 + var8.minY = var6; // L: 168 + var8.maxY = var7; // L: 169 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170 + } // L: 171 - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - 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]; + Scene_viewportXMin = 0; // L: 674 + Scene_viewportYMin = 0; // L: 675 + Scene_viewportXMax = var3; // L: 676 + Scene_viewportYMax = var4; // L: 677 + Scene_viewportXCenter = var3 / 2; // L: 678 + Scene_viewportYCenter = var4 / 2; // L: 679 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 680 int var6; int var7; @@ -2457,135 +2469,135 @@ public class Scene { int var9; int var11; int var12; - 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 (var6 = 128; var6 <= 383; var6 += 32) { // L: 681 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 682 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 683 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 684 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 685 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 686 + var8 = (var6 - 128) / 32; // L: 687 + var9 = var7 / 64; // L: 688 - 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 var10 = -26; var10 < 26; ++var10) { // L: 689 + for (var11 = -26; var11 < 26; ++var11) { // L: 690 + var12 = var10 * 128; // L: 691 + int var13 = var11 * 128; // L: 692 + boolean var14 = false; // L: 693 - for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method4233(var12, var0[var8] + var15, var13)) { - var14 = true; + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 694 + if (method4329(var12, var0[var8] + var15, var13)) { // L: 695 + var14 = true; // L: 696 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 700 } } } } - 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; + for (var6 = 0; var6 < 8; ++var6) { // L: 705 + for (var7 = 0; var7 < 32; ++var7) { // L: 706 + for (var8 = -25; var8 < 25; ++var8) { // L: 707 + for (var9 = -25; var9 < 25; ++var9) { // L: 708 + boolean var16 = false; // L: 709 - label83: - 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 label83; + label84: + for (var11 = -1; var11 <= 1; ++var11) { // L: 710 + for (var12 = -1; var12 <= 1; ++var12) { // L: 711 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 712 + var16 = true; // L: 713 + break label84; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label83; + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 716 + var16 = true; // L: 717 + break label84; // L: 718 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label83; + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 720 + var16 = true; // L: 721 + break label84; // L: 722 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label83; + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 724 + var16 = true; // L: 725 + break label84; // L: 726 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 730 } } } } - } + } // L: 735 - @ObfuscatedName("ag") - static boolean method4233(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; - if (var5 >= 50 && var5 <= 3500) { - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; + @ObfuscatedName("ac") + static boolean method4329(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 738 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 739 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 740 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 741 + if (var5 >= 50 && var5 <= 3500) { // L: 742 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 743 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 744 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 745 } else { - return false; + return false; // L: 746 } } - @ObfuscatedName("ac") + @ObfuscatedName("ar") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; + return viewportWalking && Scene_selectedX != -1; // L: 765 } - @ObfuscatedName("at") - public static void method4243() { - Scene_selectedX = -1; - viewportWalking = false; - } + @ObfuscatedName("ad") + public static void method4451() { + Scene_selectedX = -1; // L: 769 + viewportWalking = false; // L: 770 + } // L: 771 - @ObfuscatedName("aj") - static final int method4242(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("au") + static final int method4324(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1376 + if (var1 < 2) { // L: 1377 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1378 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1379 } - @ObfuscatedName("am") + @ObfuscatedName("aj") @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) { + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1383 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1384 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1385 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1386 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); - if (var8 == 0) { - if (var9 != 0) { - return var9 < 0 ? var10 <= 0 : var10 >= 0; + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1387 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1388 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1389 + if (var8 == 0) { // L: 1390 + if (var9 != 0) { // L: 1393 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1394 } else { - return true; + return true; // L: 1396 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1391 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 25a1ebbd6f..ea0bd77913 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,102 +2,102 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hr") +@ObfuscatedName("hs") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("c") - static int[] field2497; - @ObfuscatedName("b") - static int[] field2498; - @ObfuscatedName("x") - static int[] field2499; - @ObfuscatedName("p") - static int[] field2500; + @ObfuscatedName("u") + static int[] field2501; + @ObfuscatedName("n") + static int[] field2488; @ObfuscatedName("z") - static int[] field2484; - @ObfuscatedName("h") - static final int[][] field2502; - @ObfuscatedName("o") - static final int[][] field2503; - @ObfuscatedName("l") + static int[] field2503; + @ObfuscatedName("q") + static int[] field2504; + @ObfuscatedName("d") + static int[] field2502; + @ObfuscatedName("r") + static final int[][] field2505; + @ObfuscatedName("m") + static final int[][] field2492; + @ObfuscatedName("i") @Export("vertexX") int[] vertexX; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("vertexY") int[] vertexY; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("faceX") int[] faceX; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("faceY") int[] faceY; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("faceZ") int[] faceZ; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("isFlat") boolean isFlat; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("shape") int shape; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("rotation") int rotation; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("overlayRgb") int overlayRgb; static { - field2497 = new int[6]; - field2498 = new int[6]; - field2499 = new int[6]; - field2500 = new int[6]; - field2484 = new int[6]; - field2502 = 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}}; - field2503 = 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}}; + field2501 = new int[6]; // L: 21 + field2488 = new int[6]; // L: 22 + field2503 = new int[6]; // L: 23 + field2504 = new int[6]; // L: 24 + field2502 = new int[6]; // L: 25 + field2505 = 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 + field2492 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { - this.isFlat = true; - if (var7 != var6 || var8 != var6 || var9 != var6) { + this.isFlat = true; // L: 16 + if (var7 != var6 || var8 != var6 || var9 != var6) { // L: 58 this.isFlat = false; } - 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 = field2502[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; + 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 = field2505[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 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) { - var31 = var24[var30]; - if ((var31 & 1) == 0 && var31 <= 8) { + for (int var30 = 0; var30 < var25; ++var30) { // L: 76 + var31 = var24[var30]; // L: 77 + if ((var31 & 1) == 0 && var31 <= 8) { // L: 78 var31 = (var31 - var2 - var2 - 1 & 7) + 1; } - if (var31 > 8 && var31 <= 12) { + if (var31 > 8 && var31 <= 12) { // L: 79 var31 = (var31 - 9 - var2 & 3) + 9; } - if (var31 > 12 && var31 <= 16) { + if (var31 > 12 && var31 <= 16) { // L: 80 var31 = (var31 - 13 - var2 & 3) + 13; } - 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; + 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 } else { - var32 = var28 + var22; - var33 = var29 + var23; - var34 = var9; - var35 = var13; - var36 = var17; + var32 = var28 + var22; // L: 192 + var33 = var29 + var23; // L: 193 + var34 = var9; // L: 194 + var35 = var13; // L: 195 + var36 = var17; // L: 196 } - this.vertexX[var30] = var32; - this.vertexY[var30] = var34; - this.vertexZ[var30] = var33; - var26[var30] = var35; - var27[var30] = var36; + 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 } - int[] var38 = field2503[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) { + int[] var38 = field2492[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 this.triangleTextureId = new int[var31]; } - var32 = 0; + var32 = 0; // L: 213 - 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) { + 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 var35 = var35 - var2 & 3; } - if (var36 < 4) { + if (var36 < 4) { // L: 221 var36 = var36 - var2 & 3; } - if (var37 < 4) { + if (var37 < 4) { // L: 222 var37 = var37 - var2 & 3; } - 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.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.triangleTextureId[var33] = -1; } } else { - this.triangleColorA[var33] = var27[var35]; - this.triangleColorB[var33] = var27[var36]; - this.triangleColorC[var33] = var27[var37]; - if (this.triangleTextureId != null) { + 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.triangleTextureId[var33] = var3; } } } - var33 = var6; - var34 = var7; - if (var7 < var6) { + var33 = var6; // L: 239 + var34 = var7; // L: 240 + if (var7 < var6) { // L: 241 var33 = var7; } - if (var7 > var7) { + if (var7 > var7) { // L: 242 var34 = var7; } - if (var8 < var33) { + if (var8 < var33) { // L: 243 var33 = var8; } - if (var8 > var34) { + if (var8 > var34) { // L: 244 var34 = var8; } - if (var9 < var33) { + if (var9 < var33) { // L: 245 var33 = var9; } - if (var9 > var34) { + if (var9 > var34) { // L: 246 var34 = var9; } - var33 /= 14; - var34 /= 14; - } + var33 /= 14; // L: 247 + var34 /= 14; // L: 248 + } // L: 249 } diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 85f753a286..93272bd057 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -1,83 +1,59 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hg") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("y") - public static short[] field2600; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2030212895 + intValue = -1142629297 ) @Export("swColor") int swColor; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1181812781 + intValue = -1241248513 ) @Export("seColor") int seColor; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1463738049 + intValue = -601544489 ) @Export("neColor") int neColor; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1957825957 + intValue = -714792091 ) @Export("nwColor") int nwColor; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -435313337 + intValue = 1463497725 ) @Export("texture") int texture; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("isFlat") boolean isFlat; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1677192307 + intValue = 969353043 ) @Export("rgb") int rgb; SceneTilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - this.isFlat = true; - this.swColor = var1; - this.seColor = var2; - this.neColor = var3; - this.nwColor = var4; - this.texture = var5; - this.rgb = var6; - this.isFlat = var7; - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "35" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (class264.friendsChat != null) { - class264.friendsChat.invalidateIgnoreds(); - } - - } + 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 } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 33708dbafc..75a0c524a6 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,180 +4,207 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bp") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("ox") - @ObfuscatedGetter( - intValue = 630113855 - ) - static int field954; - @ObfuscatedName("q") - String field956; - @ObfuscatedName("f") + @ObfuscatedName("w") + String field928; + @ObfuscatedName("s") @Export("opcodes") int[] opcodes; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("intOperands") int[] intOperands; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 738752155 + intValue = -1670350009 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1783554177 + intValue = -239833439 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -276096773 + intValue = -1823289949 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1841585005 + intValue = -1448244841 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lnz;" + descriptor = "[Lnf;" ) @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); + Script_cached = new EvictingDualNodeHashTable(128); // L: 12 } Script() { - } + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)[Lnz;", - garbageValue = "-287949117" + descriptor = "(IB)[Lnf;", + garbageValue = "17" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; + return new IterableNodeHashTable[var1]; // L: 170 } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZZI)Loz;", - garbageValue = "-1258113861" + descriptor = "(III)I", + garbageValue = "1899123891" ) - static IndexedSprite method1955(boolean var0, boolean var1) { - return var0 ? (var1 ? Login.field877 : FileSystem.options_buttons_2Sprite) : (var1 ? Login.field876 : class397.options_buttons_0Sprite); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lkl;Ljava/lang/String;Ljava/lang/String;I)[Lon;", - garbageValue = "9795538" - ) - public static SpritePixels[] method1970(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - SpritePixels[] var5; - if (!VarbitComposition.method3102(var0, var3, var4)) { - var5 = null; + static int method1988(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; } else { - SpritePixels[] var7 = new SpritePixels[class414.SpriteBuffer_spriteCount]; + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } + } - for (int var8 = 0; var8 < class414.SpriteBuffer_spriteCount; ++var8) { - SpritePixels var9 = var7[var8] = new SpritePixels(); - var9.width = class414.SpriteBuffer_spriteWidth; - var9.height = class408.SpriteBuffer_spriteHeight; - var9.xOffset = class135.SpriteBuffer_xOffsets[var8]; - var9.yOffset = class131.SpriteBuffer_yOffsets[var8]; - var9.subWidth = class414.SpriteBuffer_spriteWidths[var8]; - var9.subHeight = class16.SpriteBuffer_spriteHeights[var8]; - int var10 = var9.subHeight * var9.subWidth; - byte[] var11 = class414.SpriteBuffer_pixels[var8]; - var9.pixels = new int[var10]; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "8" + ) + public static void method1989() { + if (NetCache.NetCache_socket != null) { // L: 156 + NetCache.NetCache_socket.close(); + } - for (int var12 = 0; var12 < var10; ++var12) { - var9.pixels[var12] = class351.SpriteBuffer_spritePalette[var11[var12] & 255]; + } // L: 157 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lko;Ljava/lang/String;Ljava/lang/String;I)Loe;", + garbageValue = "846421699" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 64 + int var4 = var0.getFileId(var3, var2); // L: 65 + byte[] var7 = var0.takeFile(var3, var4); // L: 70 + boolean var6; + if (var7 == null) { // L: 71 + var6 = false; // L: 72 + } else { + SpriteBuffer_decode(var7); // L: 75 + var6 = true; // L: 76 + } + + IndexedSprite var5; + if (!var6) { // L: 78 + var5 = null; // L: 79 + } else { + IndexedSprite var8 = new IndexedSprite(); // L: 84 + var8.width = class414.SpriteBuffer_spriteWidth; // L: 85 + var8.height = class414.SpriteBuffer_spriteHeight; // L: 86 + var8.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 87 + var8.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 88 + var8.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 89 + var8.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 90 + var8.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 91 + var8.pixels = class295.SpriteBuffer_pixels[0]; // L: 92 + PacketBuffer.method6913(); // L: 93 + var5 = var8; // L: 96 + } + + return var5; // L: 98 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1694864666" + ) + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 215 + var1.offset = var0.length - 2; // L: 216 + class414.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 217 + class414.SpriteBuffer_xOffsets = new int[class414.SpriteBuffer_spriteCount]; // L: 218 + class414.SpriteBuffer_yOffsets = new int[class414.SpriteBuffer_spriteCount]; // L: 219 + UrlRequester.SpriteBuffer_spriteWidths = new int[class414.SpriteBuffer_spriteCount]; // L: 220 + class414.SpriteBuffer_spriteHeights = new int[class414.SpriteBuffer_spriteCount]; // L: 221 + class295.SpriteBuffer_pixels = new byte[class414.SpriteBuffer_spriteCount][]; // L: 222 + var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8; // L: 223 + class414.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 224 + class414.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 225 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 226 + + int var3; + for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 227 + class414.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 228 + class414.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 229 + UrlRequester.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 230 + class414.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 231 + HitSplatDefinition.SpriteBuffer_spritePalette = new int[var2]; // L: 232 + + for (var3 = 1; var3 < var2; ++var3) { // L: 233 + HitSplatDefinition.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 234 + if (HitSplatDefinition.SpriteBuffer_spritePalette[var3] == 0) { // L: 235 + HitSplatDefinition.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 237 + + for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 238 + int var4 = UrlRequester.SpriteBuffer_spriteWidths[var3]; // L: 239 + int var5 = class414.SpriteBuffer_spriteHeights[var3]; // L: 240 + int var6 = var4 * var5; // L: 241 + byte[] var7 = new byte[var6]; // L: 242 + class295.SpriteBuffer_pixels[var3] = var7; // L: 243 + int var8 = var1.readUnsignedByte(); // L: 244 + int var9; + if (var8 == 0) { // L: 245 + for (var9 = 0; var9 < var6; ++var9) { // L: 246 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 248 + for (var9 = 0; var9 < var4; ++var9) { // L: 249 + for (int var10 = 0; var10 < var5; ++var10) { // L: 250 + var7[var9 + var10 * var4] = var1.readByte(); // L: 251 + } } } - - StudioGame.method5130(); - var5 = var7; } - return var5; - } - - @ObfuscatedName("em") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-348336461" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - AttackOption.logOut(); - switch(var0) { - case 1: - class112.method2474(24); - class17.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - NPC.method2233(); - } - - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(Lcx;I)V", - garbageValue = "379416409" - ) - static final void method1969(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = PlayerComposition.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = PlayerComposition.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = PlayerComposition.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = PlayerComposition.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = PlayerComposition.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = InterfaceParent.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field1096 = var4; - var0.field1095 = var5; - } + } // L: 256 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 5a0b149513..7366635c48 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -3,181 +3,106 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cy") +@ObfuscatedName("ck") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("l") + @ObfuscatedName("rq") + @ObfuscatedSignature( + descriptor = "Lak;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("fw") + @ObfuscatedGetter( + intValue = -1958240273 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("i") @Export("args") Object[] args; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("widget") Widget widget; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -16564539 + intValue = -1998799811 ) @Export("mouseX") int mouseX; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -682131027 + intValue = 1979729253 ) @Export("mouseY") int mouseY; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1167365765 + intValue = -932845739 ) @Export("opIndex") int opIndex; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -334465261 + intValue = 1702725871 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1224571083 + intValue = -1708889307 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("targetName") String targetName; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 989440955 + ) + int field1024; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1064106161 - ) - int field1037; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -2078183665 + intValue = 1164936437 ) @Export("type") int type; public ScriptEvent() { - this.type = 76; + this.type = 76; // L: 19 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "1467724189" + garbageValue = "-1142629297" ) @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; - } + this.args = var1; // L: 22 + } // L: 23 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1722413774" + garbageValue = "2078540065" ) @Export("setType") public void setType(int var1) { - this.type = var1; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "460269771" - ) - static int method2066(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - class184.queueSoundEffect(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize], Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - WorldMapSprite.playSong(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - PcmPlayer.method741(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize], Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - return 1; - } else { - int var3; - int var4; - 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; - var4 = 0; - if (var0 == 3210) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.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) { - float var5 = 200.0F * ((float)WorldMapDecorationType.clientPreferences.brightness - 0.5F); - var4 = 100 - Math.round(var5); - } else if (var3 == 7) { - var4 = Math.round((float)WorldMapDecorationType.clientPreferences.musicVolume / 2.55F); - } else if (var3 == 8) { - var4 = Math.round((float)WorldMapDecorationType.clientPreferences.soundEffectsVolume / 1.27F); - } else if (var3 == 9) { - var4 = Math.round((float)WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume / 1.27F); - } - - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4; - return 1; - } - } else { - var3 = 0; - var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var0 == 3209) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.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) { - var4 = 100 - Math.min(Math.max(var4, 0), 100); - class268.method5105((double)(0.5F + (float)var4 / 200.0F)); - } else if (var3 == 7) { - var4 = Math.min(Math.max(var4, 0), 100); - class29.method430(Math.round(2.55F * (float)var4)); - } else if (var3 == 8) { - var4 = Math.min(Math.max(var4, 0), 100); - class129.updateSoundEffectVolume(Math.round(1.27F * (float)var4)); - } else if (var3 == 9) { - var4 = Math.min(Math.max(var4, 0), 100); - GrandExchangeOfferOwnWorldComparator.method1104(Math.round(1.27F * (float)var4)); - } - - return 1; - } - } - } + this.type = var1; // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 5ef101cfdb..b6a4910b04 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,183 +3,453 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bj") +@ObfuscatedName("bt") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lbe;" + descriptor = "Lbp;" ) @Export("script") Script script; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 574495061 + intValue = -17818799 ) @Export("pc") int pc; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("intLocals") int[] intLocals; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("stringLocals") String[] stringLocals; ScriptFrame() { - this.pc = -1; - } + this.pc = -1; // L: 5 + } // L: 9 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "45" + descriptor = "(II)Lfw;", + garbageValue = "-39610559" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = World.getPreferencesFile("", class392.field4267.name, true); - Buffer var1 = WorldMapDecorationType.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57 + if (var1 != null) { // L: 58 + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59 + var1 = new NPCComposition(); // L: 60 + var1.id = var0; // L: 61 + if (var2 != null) { // L: 62 + var1.decode(new Buffer(var2)); } - } catch (Exception var2) { - } + var1.postDecode(); // L: 63 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 + return var1; // L: 65 + } } - @ObfuscatedName("gd") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-15" + descriptor = "(IIB)I", + garbageValue = "77" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = class262.fontPlain12.lineWidth(var0, 250); - int var6 = class262.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); - class262.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - int var7 = var3 - var2; - int var8 = var4 - var2; - int var9 = var2 + var5 + var2; - int var10 = var6 + var2 + var2; + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + } + } - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { - Client.field710[var11] = true; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1571821946" + ) + public static void method1117() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 117 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 118 + } // L: 119 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "1762076085" + ) + static int method1118(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1412 + var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1413 + class397.addGameMessage(0, "", var7); // L: 1414 + return 1; // L: 1415 + } else if (var0 == ScriptOpcodes.ANIM) { + class14.Interpreter_intStackSize -= 2; // L: 1418 + FaceNormal.performPlayerAnimation(HealthBarDefinition.localPlayer, Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 1419 + return 1; // L: 1420 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field791) { // L: 1423 + Interpreter.field795 = true; // L: 1424 + } + + return 1; // L: 1426 + } else { + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1429 + var16 = 0; // L: 1430 + if (class129.isNumber(var7)) { // L: 1431 + var16 = TaskHandler.method2881(var7); } - } - if (var1) { - class244.rasterProvider.drawFull(0, 0); + PacketBufferNode var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2754, Client.packetWriter.isaacCipher); // L: 1433 + var14.packetBuffer.writeInt(var16); // L: 1434 + Client.packetWriter.addNode(var14); // L: 1435 + return 1; // L: 1436 } else { - class112.method2468(var3, var4, var5, var6); - } + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1439 + var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2764, Client.packetWriter.isaacCipher); // L: 1441 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1442 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1443 + Client.packetWriter.addNode(var12); // L: 1444 + return 1; // L: 1445 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1448 + var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2707, Client.packetWriter.isaacCipher); // L: 1450 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1451 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1452 + Client.packetWriter.addNode(var12); // L: 1453 + return 1; // L: 1454 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1457 + var4 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1458 + AbstractByteArrayCopier.method5169(var10, var4); // L: 1459 + return 1; // L: 1460 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class14.Interpreter_intStackSize -= 3; // L: 1463 + var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1464 + var16 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1465 + int var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 1466 + Widget var15 = UserComparator9.getWidget(var9); // L: 1467 + UserComparator6.clickWidget(var15, var10, var16); // L: 1468 + return 1; // L: 1469 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class14.Interpreter_intStackSize -= 2; // L: 1472 + var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1473 + var16 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1474 + Widget var13 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1475 + UserComparator6.clickWidget(var13, var10, var16); // L: 1476 + return 1; // L: 1477 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + ApproximateRouteStrategy.mouseCam = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1480 + return 1; // L: 1481 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.roofsHidden ? 1 : 0; // L: 1484 + return 1; // L: 1485 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + class408.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1488 + Login.savePreferences(); // L: 1489 + return 1; // L: 1490 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1493 + boolean var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1494 + class91.openURL(var7, var8, false); // L: 1495 + return 1; // L: 1496 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1499 + var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2685, Client.packetWriter.isaacCipher); // L: 1501 + var12.packetBuffer.writeShort(var10); // L: 1502 + Client.packetWriter.addNode(var12); // L: 1503 + return 1; // L: 1504 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1507 + class295.Interpreter_stringStackSize -= 2; // L: 1508 + var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 1509 + String var5 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 1510 + if (var4.length() > 500) { // L: 1511 + return 1; + } else if (var5.length() > 500) { // L: 1512 + return 1; + } else { + PacketBufferNode var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2724, Client.packetWriter.isaacCipher); // L: 1513 + var6.packetBuffer.writeShort(1 + Client.stringCp1252NullTerminatedByteSize(var4) + Client.stringCp1252NullTerminatedByteSize(var5)); // L: 1514 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1515 + var6.packetBuffer.writeByte(var10); // L: 1516 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1517 + Client.packetWriter.addNode(var6); // L: 1518 + return 1; // L: 1519 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1522 + return 1; // L: 1523 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1526 + return 1; // L: 1527 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1530 + return 1; // L: 1531 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1534 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1535 + } - } - } + return 1; // L: 1536 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1539 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1540 + } - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(Lci;IIIB)V", - garbageValue = "-1" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class67.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - int var7; - if (var0.skillLevel == 0) { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = class67.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = FloorUnderlayDefinition.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = FloorUnderlayDefinition.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = FloorUnderlayDefinition.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = FloorUnderlayDefinition.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = FloorUnderlayDefinition.colorStartTag(65280); - } else if (var9 > 6) { - var6 = FloorUnderlayDefinition.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = FloorUnderlayDefinition.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = FloorUnderlayDefinition.colorStartTag(12648192); + return 1; // L: 1541 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1544 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1545 + } + + return 1; // L: 1546 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1549 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1550 + } + + return 1; // L: 1551 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1554 + return 1; // L: 1555 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1558 + return 1; // L: 1559 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1562 + return 1; // L: 1563 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + Messages.setTapToDrop(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1); // L: 1566 + return 1; // L: 1567 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Decimator.getTapToDrop() ? 1 : 0; // L: 1570 + return 1; // L: 1571 + } else if (var0 == 3129) { + class14.Interpreter_intStackSize -= 2; // L: 1574 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1575 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1576 + return 1; // L: 1577 + } else if (var0 == 3130) { + class14.Interpreter_intStackSize -= 2; // L: 1580 + return 1; // L: 1581 + } else if (var0 == 3131) { + --class14.Interpreter_intStackSize; // L: 1584 + return 1; // L: 1585 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 1588 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KeyHandler.canvasHeight; // L: 1589 + return 1; // L: 1590 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class14.Interpreter_intStackSize; // L: 1593 + return 1; // L: 1594 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1597 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class14.Interpreter_intStackSize -= 2; // L: 1600 + return 1; // L: 1601 + } else if (var0 == 3136) { + Client.field479 = 3; // L: 1604 + Client.field633 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1605 + return 1; // L: 1606 + } else if (var0 == 3137) { + Client.field479 = 2; // L: 1609 + Client.field633 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1610 + return 1; // L: 1611 + } else if (var0 == 3138) { + Client.field479 = 0; // L: 1614 + return 1; // L: 1615 + } else if (var0 == 3139) { + Client.field479 = 1; // L: 1618 + return 1; // L: 1619 + } else if (var0 == 3140) { + Client.field479 = 3; // L: 1622 + Client.field633 = var2 ? class120.scriptDotWidget.id * 851670683 * -830177389 : Frames.scriptActiveWidget.id * 851670683 * -830177389; // L: 1623 + return 1; // L: 1624 } else { - var6 = FloorUnderlayDefinition.colorStartTag(16776960); - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var10; - if (Client.isItemSelected == 1) { - GameBuild.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ObjectComposition.selectedSpellFlags & 8) == 8) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class67.localPlayer.combatLevel) { - var11 = 2000; - } - - if (class67.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class67.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } else if (Client.playerAttackOption == AttackOption.field1237 && var0.isClanMember()) { - var11 = 2000; - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1627 + class408.clientPreferences.hideUsername = var11; // L: 1628 + Login.savePreferences(); // L: 1629 + return 1; // L: 1630 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.hideUsername ? 1 : 0; // L: 1633 + return 1; // L: 1634 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1637 + Client.Login_isUsernameRemembered = var11; // L: 1638 + if (!var11) { // L: 1639 + class408.clientPreferences.rememberedUsername = ""; // L: 1640 + Login.savePreferences(); // L: 1641 } - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - GameBuild.insertMenuItemNoShift(Client.playerMenuActions[var10], FloorUnderlayDefinition.colorStartTag(16777215) + var4, var7, var1, var2, var3); + return 1; // L: 1643 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1646 + return 1; // L: 1647 + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; // L: 1650 + } else if (var0 == 3146) { + var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1653 + if (var11 == class408.clientPreferences.titleMusicDisabled) { // L: 1654 + class408.clientPreferences.titleMusicDisabled = !var11; // L: 1655 + Login.savePreferences(); // L: 1656 + } + + return 1; // L: 1658 + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1661 + return 1; // L: 1662 + } else if (var0 == 3148) { + return 1; // L: 1665 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1668 + return 1; // L: 1669 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1672 + return 1; // L: 1673 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1676 + return 1; // L: 1677 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1680 + return 1; // L: 1681 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1684 + return 1; // L: 1685 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class87.method2224(); // L: 1688 + return 1; // L: 1689 + } else if (var0 == 3155) { + --class295.Interpreter_stringStackSize; // L: 1692 + return 1; // L: 1693 + } else if (var0 == 3156) { + return 1; // L: 1696 + } else if (var0 == 3157) { + class14.Interpreter_intStackSize -= 2; // L: 1699 + return 1; // L: 1700 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1703 + return 1; // L: 1704 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1707 + return 1; // L: 1708 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1711 + return 1; // L: 1712 + } else if (var0 == 3161) { + --class14.Interpreter_intStackSize; // L: 1715 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1716 + return 1; // L: 1717 + } else if (var0 == 3162) { + --class14.Interpreter_intStackSize; // L: 1720 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1721 + return 1; // L: 1722 + } else if (var0 == 3163) { + --class295.Interpreter_stringStackSize; // L: 1725 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1726 + return 1; // L: 1727 + } else if (var0 == 3164) { + --class14.Interpreter_intStackSize; // L: 1730 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1731 + return 1; // L: 1732 + } else if (var0 == 3165) { + --class14.Interpreter_intStackSize; // L: 1735 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1736 + return 1; // L: 1737 + } else if (var0 == 3166) { + class14.Interpreter_intStackSize -= 2; // L: 1740 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1741 + return 1; // L: 1742 + } else if (var0 == 3167) { + class14.Interpreter_intStackSize -= 2; // L: 1745 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1746 + return 1; // L: 1747 + } else if (var0 == 3168) { + class14.Interpreter_intStackSize -= 2; // L: 1750 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1751 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1752 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1753 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1754 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1755 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1756 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1757 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1758 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3169) { + return 1; // L: 1763 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1766 + return 1; // L: 1767 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1770 + return 1; // L: 1771 + } else if (var0 == 3172) { + --class14.Interpreter_intStackSize; // L: 1774 + return 1; // L: 1775 + } else if (var0 == 3173) { + --class14.Interpreter_intStackSize; // L: 1778 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1779 + return 1; // L: 1780 + } else if (var0 == 3174) { + --class14.Interpreter_intStackSize; // L: 1783 + return 1; // L: 1784 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1787 + return 1; // L: 1788 + } else if (var0 == 3176) { + return 1; // L: 1791 + } else if (var0 == 3177) { + return 1; // L: 1794 + } else if (var0 == 3178) { + --class295.Interpreter_stringStackSize; // L: 1797 + return 1; // L: 1798 + } else if (var0 == 3179) { + return 1; // L: 1801 + } else if (var0 == 3180) { + --class295.Interpreter_stringStackSize; // L: 1804 + return 1; // L: 1805 + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize], 0), 100); // L: 1808 + class354.method6396((double)((float)var10 / 200.0F + 0.5F)); // L: 1809 + return 1; // L: 1810 + } else if (var0 == 3182) { + float var3 = ((float)class408.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1813 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1814 + return 1; // L: 1815 + } else if (var0 != 3183 && var0 != 3184) { + return 2; // L: 1821 + } else { + --class14.Interpreter_intStackSize; // L: 1818 + return 1; // L: 1819 } } } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = FloorUnderlayDefinition.colorStartTag(16777215) + var4; - break; - } - } - } } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 25896ba62c..d491270e5f 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,288 +1,88 @@ +import java.security.SecureRandom; import java.util.concurrent.Callable; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bk") +@ObfuscatedName("by") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("x") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("ma") + @ObfuscatedGetter( + intValue = -276676703 + ) + @Export("menuX") + static int menuX; + SecureRandomCallable() { - } + } // L: 42 public Object call() { - return Buddy.method6152(); + SecureRandom var2 = new SecureRandom(); // L: 47 + var2.nextInt(); // L: 48 + return var2; // L: 51 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1287485741" + descriptor = "(Lni;B)I", + garbageValue = "1" ) - static void method2036() { - Tiles.Tiles_underlays = null; - Tiles.Tiles_overlays = null; - class14.Tiles_shapes = null; - GrandExchangeEvent.field3760 = null; - Huffman.field3203 = null; - class281.field3323 = null; - Tiles.field981 = null; - class11.Tiles_hue = null; - Tiles.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - Client.Tiles_hueMultiplier = null; - Tiles.field984 = null; + static final int method2052(LoginType var0) { + if (var0 == null) { // L: 16 + return 12; // L: 17 + } else { + switch(var0.field4229) { // L: 19 + case 2: + return 20; // L: 21 + default: + return 12; // L: 23 + } + } } - @ObfuscatedName("ah") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1022742204" + descriptor = "(II)I", + garbageValue = "924721389" ) - static int method2026(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4 * var3; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 13 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "76" + ) + public static int method2047(int var0) { + if (var0 > 0) { // L: 212 return 1; } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else if (var0 == ScriptOpcodes.BITCOUNT) { - var3 = WorldMapData_1.method3757(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ChatChannel.method1978(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = GrandExchangeEvents.method5348(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; - return 1; - } else if (var0 == 4030) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - var3 = GrandExchangeEvents.method5348(var3, var5, var6); - var7 = FloorOverlayDefinition.method3343(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class185.method3784(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class283.method5141(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class140.method2770(var3, var4); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1]); - return 1; - } else { - return 2; - } + return var0 < 0 ? -1 : 0; // L: 213 214 } } - @ObfuscatedName("hq") + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1668664473" + descriptor = "(IIIZI)V", + garbageValue = "-1971468049" ) - static final void method2035() { - int var0 = LoginScreenAnimation.menuX; - int var1 = class392.menuY; - int var2 = UserComparator7.menuWidth; - int var3 = ApproximateRouteStrategy.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); - Interpreter.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); - int var5 = MouseHandler.MouseHandler_x; - int var6 = MouseHandler.MouseHandler_y; - - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { - int var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; - int var9 = 16777215; - if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { - var9 = 16776960; - } - - Font var10 = Interpreter.fontBold12; - String var11; - if (var7 < 0) { - var11 = ""; - } else if (Client.menuTargets[var7].length() > 0) { - var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; - } else { - var11 = Client.menuActions[var7]; - } - - var10.draw(var11, var0 + 3, var8, var9, 0); + static final void method2051(int var0, int var1, int var2, boolean var3) { + if (class174.loadInterface(var0)) { // L: 10239 + WorldMapLabelSize.resizeInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10240 } - - class112.method2468(LoginScreenAnimation.menuX, class392.menuY, UserComparator7.menuWidth, ApproximateRouteStrategy.menuHeight); - } + } // L: 10241 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index f318bce868..d9fb480a8e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -7,111 +7,211 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bk") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("w") + @ObfuscatedName("ep") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkd;" ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "[Lon;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("l") + @Export("archive9") + static Archive archive9; + @ObfuscatedName("i") @Export("executor") ExecutorService executor; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("future") Future future; SecureRandomFuture() { - this.executor = Executors.newSingleThreadExecutor(); - this.future = this.executor.submit(new SecureRandomCallable()); - } + this.executor = Executors.newSingleThreadExecutor(); // L: 10 + this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "104" + garbageValue = "14" ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); - this.executor = null; - } + this.executor.shutdown(); // L: 18 + this.executor = null; // L: 19 + } // L: 20 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "73" + descriptor = "(I)Z", + garbageValue = "-1642436388" ) @Export("isDone") boolean isDone() { - return this.future.isDone(); + return this.future.isDone(); // L: 23 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-1230835583" + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-11" ) @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); - } catch (Exception var2) { - return Buddy.method6152(); + return (SecureRandom)this.future.get(); // L: 28 + } catch (Exception var4) { // L: 30 + SecureRandom var3 = new SecureRandom(); // L: 33 + var3.nextInt(); // L: 34 + return var3; // L: 37 } } - @ObfuscatedName("q") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(Lot;I)Ljava/lang/String;", - garbageValue = "707406336" + descriptor = "(II)V", + garbageValue = "1350647812" ) - public static String method1951(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; - } + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 3071 + class1.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 3072 + class1.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 3073 + class1.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 3074 + class275.method5201(3); // L: 3075 + Login.field865 = 1; // L: 3076 + } else if (var0 == 4) { // L: 3078 + class275.method5201(14); // L: 3080 + Login.field866 = 0; // L: 3081 + } else if (var0 == 5) { // L: 3084 + Login.field865 = 2; // L: 3085 + class1.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: 3086 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 3088 + if (var0 == 7) { // L: 3091 + class1.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 3092 + class1.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 3093 + class1.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 3094 + class1.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 3095 + class1.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 3096 + class1.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 3097 + class1.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 3098 + class1.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 3099 + class1.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 3100 + class1.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: 3101 + class275.method5201(14); // L: 3103 + Login.field866 = 1; // L: 3104 + } else if (var0 == 19) { // L: 3107 + class1.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 3108 + class1.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 3109 + class1.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 3110 + class1.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 3111 + class1.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 3112 + class1.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 3113 + class1.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 3114 + class1.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + class1.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); // L: 3115 + } else if (var0 == 32) { // L: 3116 + class1.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { // L: 3117 + class1.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 3118 + class1.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 3119 + class275.method5201(8); // L: 3120 + } else { + if (var0 == 56) { // L: 3122 + class1.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3123 + WorldMapData_1.updateGameState(11); // L: 3124 + return; // L: 3125 + } - byte[] var3 = new byte[var2]; - var0.offset += class264.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = Fonts.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; - } + if (var0 == 57) { // L: 3127 + class1.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3128 + WorldMapData_1.updateGameState(11); // L: 3129 + return; // L: 3130 + } - return var1; - } - - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljt;I)Ljava/lang/String;", - garbageValue = "-1891184957" - ) - static String method1952(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; + if (var0 == 61) { // L: 3132 + class275.method5201(7); // L: 3133 + } else { + if (var0 == 62) { // L: 3135 + WorldMapData_1.updateGameState(10); // L: 3136 + class275.method5201(9); // L: 3137 + class1.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 3138 + return; // L: 3139 } - var0 = var0.substring(0, var3) + class54.method1057(FriendsChat.method5992(var1, var2 - 1)) + var0.substring(var3 + 2); + if (var0 == 63) { // L: 3141 + WorldMapData_1.updateGameState(10); // L: 3142 + class275.method5201(9); // L: 3143 + class1.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 3144 + return; // L: 3145 + } + + if (var0 == 65 || var0 == 67) { // L: 3147 + WorldMapData_1.updateGameState(10); // L: 3148 + class275.method5201(9); // L: 3149 + class1.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 3150 + return; // L: 3151 + } + + class1.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3153 } } + } else { + class1.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3089 } - return var0; - } + WorldMapData_1.updateGameState(10); // L: 3154 + if (Client.field500.method7220()) { // L: 3155 + class275.method5201(9); // L: 3156 + } + + } // L: 3158 + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "75" + ) + static final void method1979(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8068 + if (Client.showMouseOverText) { // L: 8069 + int var2 = Client.menuOptionsCount - 1; // L: 8072 + String var4; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8076 + var4 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8077 + var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var4 = class392.method6873(var2); // L: 8078 + } + + if (Client.menuOptionsCount > 2) { // L: 8079 + var4 = var4 + MouseHandler.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + Login.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8080 + } + } + } // L: 8081 } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 8b9eba3a72..fef6c763a4 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,91 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fm") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("sg") - @ObfuscatedGetter( - intValue = 1752918559 - ) - static int field1954; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lko;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("m") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("k") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("g") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 500568589 + intValue = -724339659 ) @Export("frameCount") public int frameCount; + @ObfuscatedName("x") + int[] field1957; @ObfuscatedName("y") - int[] field1953; - @ObfuscatedName("w") - public boolean field1945; - @ObfuscatedName("g") + public boolean field1958; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 102030039 + intValue = -1109851961 ) - public int field1955; - @ObfuscatedName("v") + public int field1959; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 961941809 + intValue = -2080361701 ) @Export("shield") public int shield; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 848725063 + intValue = 911643557 ) @Export("weapon") public int weapon; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1370198801 + intValue = 1755314831 ) - public int field1952; - @ObfuscatedName("b") + public int field1962; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1801078555 + intValue = 1777344097 ) - public int field1959; - @ObfuscatedName("x") + public int field1963; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1401670869 + intValue = 532178661 ) - public int field1960; - @ObfuscatedName("p") + public int field1956; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2079014027 + intValue = 1664617853 ) - public int field1961; + public int field1965; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -97,281 +104,372 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field1945 = false; - this.field1955 = 5; + this.field1958 = false; + this.field1959 = 5; this.shield = -1; this.weapon = -1; - this.field1952 = 99; - this.field1959 = -1; - this.field1960 = -1; - this.field1961 = 2; + this.field1962 = 99; + this.field1963 = -1; + this.field1956 = -1; + this.field1965 = 2; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-1628718793" + descriptor = "(Lop;S)V", + garbageValue = "-19285" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 47 + if (var2 == 0) { // L: 48 + return; // L: 51 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 49 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "2076948132" + descriptor = "(Lop;II)V", + garbageValue = "1217260020" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { - var3 = var1.readUnsignedShort(); - this.frameLengths = new int[var3]; + if (var2 == 1) { // L: 54 + var3 = var1.readUnsignedShort(); // L: 55 + this.frameLengths = new int[var3]; // L: 56 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 57 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; + this.frameIds = new int[var3]; // L: 58 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 59 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 60 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 62 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); - this.field1953 = new int[var3 + 1]; + } else if (var2 == 3) { // L: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.field1957 = new int[var3 + 1]; // L: 65 - for (var4 = 0; var4 < var3; ++var4) { - this.field1953[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 66 + this.field1957[var4] = var1.readUnsignedByte(); } - this.field1953[var3] = 9999999; - } else if (var2 == 4) { - this.field1945 = true; - } else if (var2 == 5) { - this.field1955 = var1.readUnsignedByte(); - } else if (var2 == 6) { - this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { - this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { - this.field1952 = var1.readUnsignedByte(); - } else if (var2 == 9) { + this.field1957[var3] = 9999999; // L: 67 + } else if (var2 == 4) { // L: 69 + this.field1958 = true; + } else if (var2 == 5) { // L: 70 this.field1959 = var1.readUnsignedByte(); - } else if (var2 == 10) { - this.field1960 = var1.readUnsignedByte(); - } else if (var2 == 11) { - this.field1961 = var1.readUnsignedByte(); - } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); - this.chatFrameIds = new int[var3]; + } else if (var2 == 6) { // L: 71 + this.shield = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 72 + this.weapon = var1.readUnsignedShort(); + } else if (var2 == 8) { // L: 73 + this.field1962 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 74 + this.field1963 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 75 + this.field1956 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 76 + this.field1965 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 77 + var3 = var1.readUnsignedByte(); // L: 78 + this.chatFrameIds = new int[var3]; // L: 79 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 80 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 81 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { - var3 = var1.readUnsignedByte(); - this.soundEffects = new int[var3]; + } else if (var2 == 13) { // L: 83 + var3 = var1.readUnsignedByte(); // L: 84 + this.soundEffects = new int[var3]; // L: 85 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 86 this.soundEffects[var4] = var1.readMedium(); } } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1690125059" - ) - @Export("postDecode") - void postDecode() { - if (this.field1959 == -1) { - if (this.field1953 != null) { - this.field1959 = 2; - } else { - this.field1959 = 0; - } - } - - if (this.field1960 == -1) { - if (this.field1953 != null) { - this.field1960 = 2; - } else { - this.field1960 = 0; - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lhl;IS)Lhl;", - garbageValue = "-22376" - ) - @Export("transformActorModel") - public Model transformActorModel(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = MilliClock.getFrames(var2 >> 16); - var2 &= 65535; - if (var3 == null) { - return var1.toSharedSequenceModel(true); - } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lhl;IIB)Lhl;", - garbageValue = "-28" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; - Frames var4 = MilliClock.getFrames(var2 >> 16); - var2 &= 65535; - if (var4 == null) { - return var1.toSharedSequenceModel(true); - } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { - var5.rotateY270Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY90Ccw(); - } - - var5.animate(var4, var2); - if (var3 == 1) { - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY270Ccw(); - } - - return var5; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lhl;IB)Lhl;", - garbageValue = "-58" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = MilliClock.getFrames(var2 >> 16); - var2 &= 65535; - if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); - } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; - } - } + } // L: 89 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lhl;ILfe;IS)Lhl;", - garbageValue = "6680" + descriptor = "(I)V", + garbageValue = "2018272752" ) - @Export("applyTransformations") - public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; - Frames var5 = MilliClock.getFrames(var2 >> 16); - var2 &= 65535; - if (var5 == null) { - return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; - Frames var6 = MilliClock.getFrames(var4 >> 16); - var4 &= 65535; - Model var7; - if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); - return var7; + @Export("postDecode") + void postDecode() { + if (this.field1963 == -1) { // L: 92 + if (this.field1957 != null) { // L: 93 + this.field1963 = 2; } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field1953); - return var7; + this.field1963 = 0; // L: 94 } } + + if (this.field1956 == -1) { // L: 96 + if (this.field1957 != null) { // L: 97 + this.field1956 = 2; + } else { + this.field1956 = 0; // L: 98 + } + } + + } // L: 100 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lhl;IS)Lhl;", + garbageValue = "11483" + ) + @Export("transformActorModel") + public Model transformActorModel(Model var1, int var2) { + var2 = this.frameIds[var2]; // L: 103 + Frames var3 = DynamicObject.getFrames(var2 >> 16); // L: 104 + var2 &= 65535; // L: 105 + if (var3 == null) { + return var1.toSharedSequenceModel(true); // L: 106 + } else { + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107 + var4.animate(var3, var2); // L: 108 + return var4; // L: 109 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lhl;IIB)Lhl;", + garbageValue = "0" + ) + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + var2 = this.frameIds[var2]; // L: 113 + Frames var4 = DynamicObject.getFrames(var2 >> 16); // L: 114 + var2 &= 65535; // L: 115 + if (var4 == null) { // L: 116 + return var1.toSharedSequenceModel(true); + } else { + Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 117 + var3 &= 3; // L: 118 + if (var3 == 1) { // L: 119 + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 120 + var5.rotateY180(); + } else if (var3 == 3) { // L: 121 + var5.rotateY90Ccw(); + } + + var5.animate(var4, var2); // L: 122 + if (var3 == 1) { // L: 123 + var5.rotateY90Ccw(); + } else if (var3 == 2) { // L: 124 + var5.rotateY180(); + } else if (var3 == 3) { // L: 125 + var5.rotateY270Ccw(); + } + + return var5; // L: 126 + } } @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lhl;IB)Lhl;", - garbageValue = "0" + garbageValue = "55" + ) + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + var2 = this.frameIds[var2]; // L: 130 + Frames var3 = DynamicObject.getFrames(var2 >> 16); // L: 131 + var2 &= 65535; // L: 132 + if (var3 == null) { + return var1.toSharedSpotAnimationModel(true); // L: 133 + } else { + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); // L: 134 + var4.animate(var3, var2); // L: 135 + return var4; // L: 136 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lhl;ILfm;II)Lhl;", + garbageValue = "1824353368" + ) + @Export("applyTransformations") + public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 140 + Frames var5 = DynamicObject.getFrames(var2 >> 16); // L: 141 + var2 &= 65535; // L: 142 + if (var5 == null) { // L: 143 + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; // L: 144 + Frames var6 = DynamicObject.getFrames(var4 >> 16); // L: 145 + var4 &= 65535; // L: 146 + Model var7; + if (var6 == null) { // L: 147 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 148 + var7.animate(var5, var2); // L: 149 + return var7; // L: 150 + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 + var7.animate2(var5, var2, var6, var4, this.field1957); // L: 153 + return var7; // L: 154 + } + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lhl;II)Lhl;", + garbageValue = "530277296" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - int var3 = this.frameIds[var2]; - Frames var4 = MilliClock.getFrames(var3 >> 16); - var3 &= 65535; - if (var4 == null) { + int var3 = this.frameIds[var2]; // L: 158 + Frames var4 = DynamicObject.getFrames(var3 >> 16); // L: 159 + var3 &= 65535; // L: 160 + if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; - int var6 = 0; - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { - var6 = this.chatFrameIds[var2]; - var5 = MilliClock.getFrames(var6 >> 16); - var6 &= 65535; + Frames var5 = null; // L: 162 + int var6 = 0; // L: 163 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 + var6 = this.chatFrameIds[var2]; // L: 165 + var5 = DynamicObject.getFrames(var6 >> 16); // L: 166 + var6 &= 65535; // L: 167 } Model var7; - if (var5 != null && var6 != 65535) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); - var7.animate(var4, var3); - var7.animate(var5, var6); - return var7; + if (var5 != null && var6 != 65535) { // L: 169 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 174 + var7.animate(var4, var3); // L: 175 + var7.animate(var5, var6); // L: 176 + return var7; // L: 177 } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); - var7.animate(var4, var3); - return var7; + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 170 + var7.animate(var4, var3); // L: 171 + return var7; // L: 172 } } } - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "870841332" - ) - static void method3381() { - if (TileItem.worldMap != null) { - TileItem.worldMap.method6504(VertexNormal.Client_plane, (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX, (class67.localPlayer.y >> 7) + PlayerComposition.baseY, false); - TileItem.worldMap.loadCache(); + @ObfuscatedName("i") + public static final int method3461(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (0.0D != var2) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = var4 * (var2 + 1.0D); + } else { + var12 = var4 + var2 - var2 * var4; // L: 15 + } + + double var14 = 2.0D * var4 - var12; // L: 16 + double var16 = 0.3333333333333333D + var0; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (6.0D * var16 < 1.0D) { // L: 22 + var6 = var14 + 6.0D * (var12 - var14) * var16; + } else if (2.0D * var16 < 1.0D) { // L: 23 + var6 = var12; + } else if (3.0D * var16 < 2.0D) { // L: 24 + var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; + } else { + var6 = var14; // L: 25 + } + + if (var0 * 6.0D < 1.0D) { // L: 26 + var8 = var14 + 6.0D * (var12 - var14) * var0; + } else if (2.0D * var0 < 1.0D) { // L: 27 + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; // L: 28 + } else { + var8 = var14; // L: 29 + } + + if (var20 * 6.0D < 1.0D) { // L: 30 + var10 = var20 * (var12 - var14) * 6.0D + var14; + } else if (var20 * 2.0D < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else { + var10 = var14; // L: 33 + } } + int var22 = (int)(256.0D * var6); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1706767111" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 3161 + class19.method289(); // L: 3162 + GameBuild.scene.clear(); // L: 3163 + + for (int var0 = 0; var0 < 4; ++var0) { // L: 3164 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 3165 + class247.musicPlayerStatus = 1; // L: 3167 + class128.musicTrackArchive = null; // L: 3168 + FillMode.musicTrackGroupId = -1; // L: 3169 + ArchiveDiskActionHandler.musicTrackFileId = -1; // L: 3170 + class247.musicTrackVolume = 0; // L: 3171 + SecureRandomCallable.musicTrackBoolean = false; // L: 3172 + class247.pcmSampleLength = 2; // L: 3173 + Client.currentTrackGroupId = -1; // L: 3175 + Client.field710 = false; // L: 3176 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3178 + if (var1.stream1 != null) { // L: 3179 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3180 + var1.stream1 = null; // L: 3181 + } + + if (var1.stream2 != null) { // L: 3183 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3184 + var1.stream2 = null; // L: 3185 + } + } + + ObjectSound.objectSounds.clear(); // L: 3188 + WorldMapData_1.updateGameState(10); // L: 3190 + } // L: 3191 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index d6657b3383..7d986a4563 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,681 +4,617 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ia") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2878; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2882; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2869; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2790; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2791; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2792; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2862; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2794; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2827; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2841; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2832; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2798; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2799; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2789; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2804; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2802; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2795; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2816; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2805; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2806; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2807; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2803; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2809; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2810; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2811; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2808; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2813; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2817; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2815; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2812; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2801; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2818; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2819; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2820; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2788; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2822; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2823; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2796; - @ObfuscatedName("ar") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2845; - @ObfuscatedName("ac") + public static final ServerPacket field2874; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2826; - @ObfuscatedName("at") + public static final ServerPacket field2863; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2821; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2828; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2829; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2830; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2831; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2814; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2833; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2834; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2835; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2797; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2836; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2838; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2839; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2840; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2865; - @ObfuscatedName("bf") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2787; - @ObfuscatedName("bj") + public static final ServerPacket field2821; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" + ) + public static final ServerPacket field2797; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2798; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2799; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2853; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2801; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2802; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2803; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2804; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2805; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2870; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2807; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2808; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2809; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2810; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2855; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2812; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2813; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2814; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2815; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2878; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2817; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2818; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2852; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2820; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2831; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2822; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2823; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2824; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2825; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2826; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2827; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2828; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2829; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2830; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2887; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2880; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2833; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2834; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2835; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2836; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2837; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2838; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2839; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2840; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2841; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2842; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lia;" ) public static final ServerPacket field2843; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2844; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2845; @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2879; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2846; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2847; - @ObfuscatedName("ba") + public static final ServerPacket field2800; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" + ) + public static final ServerPacket field2885; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2849; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2850; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2811; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lia;" ) public static final ServerPacket field2793; @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2849; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2850; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2851; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2852; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2853; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2861; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2855; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2848; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2857; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2858; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2859; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2860; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2824; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2874; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2863; + public static final ServerPacket field2847; @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2864; - @ObfuscatedName("ca") + public static final ServerPacket field2795; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" + ) + public static final ServerPacket field2859; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lia;" ) public static final ServerPacket field2856; - @ObfuscatedName("ct") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2800; - @ObfuscatedName("cy") + public static final ServerPacket field2857; + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2867; - @ObfuscatedName("cg") + public static final ServerPacket field2858; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2868; - @ObfuscatedName("ci") + public static final ServerPacket field2806; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2866; - @ObfuscatedName("cx") + public static final ServerPacket field2860; + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) - public static final ServerPacket field2870; - @ObfuscatedName("cd") + public static final ServerPacket field2861; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2871; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2872; - @ObfuscatedName("cl") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2873; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2842; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2875; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2876; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2877; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2864; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2851; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2832; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2867; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2868; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2869; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2819; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2871; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2792; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2873; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2890; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2862; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2876; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2875; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2816; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2879; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2882; @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2854; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2837; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lin;" - ) - public static final ServerPacket field2880; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lia;" ) public static final ServerPacket field2881; - @ObfuscatedName("cn") + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2794; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2883; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2884; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2886; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2854; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2892; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + public static final ServerPacket field2888; + @ObfuscatedName("fz") + static int[] field2893; + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -215332077 + intValue = 1996281945 ) @Export("id") public final int id; - @ObfuscatedName("cf") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -387107353 + intValue = -1899080967 ) @Export("length") public final int length; static { - field2878 = new ServerPacket(0, 4); - field2882 = new ServerPacket(1, 5); - field2869 = new ServerPacket(2, -2); - field2790 = new ServerPacket(3, 20); - field2791 = new ServerPacket(4, 0); - field2792 = new ServerPacket(5, 8); - field2862 = new ServerPacket(6, 4); - field2794 = new ServerPacket(7, 10); - field2827 = new ServerPacket(8, 6); - field2841 = new ServerPacket(9, 2); - field2832 = new ServerPacket(10, 6); - field2798 = new ServerPacket(11, 4); - field2799 = new ServerPacket(12, -2); - field2789 = new ServerPacket(13, 4); - field2804 = new ServerPacket(14, 10); - field2802 = new ServerPacket(15, -1); - field2795 = new ServerPacket(16, -2); - field2816 = new ServerPacket(17, 1); - field2805 = new ServerPacket(18, -2); - field2806 = new ServerPacket(19, -2); - field2807 = new ServerPacket(20, 1); - field2803 = new ServerPacket(21, -2); - field2809 = new ServerPacket(22, -2); - field2810 = new ServerPacket(23, 0); - field2811 = new ServerPacket(24, 5); - field2808 = new ServerPacket(25, -2); - field2813 = new ServerPacket(26, 0); - field2817 = new ServerPacket(27, 1); - field2815 = new ServerPacket(28, -2); - field2812 = new ServerPacket(29, -2); - field2801 = new ServerPacket(30, 0); - field2818 = new ServerPacket(31, 2); - field2819 = new ServerPacket(32, -1); - field2820 = new ServerPacket(33, 7); - field2788 = new ServerPacket(34, 5); - field2822 = new ServerPacket(35, 0); - field2823 = new ServerPacket(36, 0); - field2796 = new ServerPacket(37, 5); - field2845 = new ServerPacket(38, 14); - field2826 = new ServerPacket(39, 2); - field2821 = new ServerPacket(40, 2); - field2828 = new ServerPacket(41, -2); - field2829 = new ServerPacket(42, -1); - field2830 = new ServerPacket(43, 4); - field2831 = new ServerPacket(44, 2); - field2814 = new ServerPacket(45, 6); - field2833 = new ServerPacket(46, -1); - field2834 = new ServerPacket(47, 4); - field2835 = new ServerPacket(48, 3); - field2797 = new ServerPacket(49, 2); - field2836 = new ServerPacket(50, 6); - field2838 = new ServerPacket(51, 2); - field2839 = new ServerPacket(52, -2); - field2840 = new ServerPacket(53, -1); - field2865 = new ServerPacket(54, 8); - field2787 = new ServerPacket(55, 2); - field2843 = new ServerPacket(56, 6); - field2844 = new ServerPacket(57, 6); - field2879 = new ServerPacket(58, -1); - field2846 = new ServerPacket(59, -2); - field2847 = new ServerPacket(60, -2); - field2793 = new ServerPacket(61, 7); - field2849 = new ServerPacket(62, -2); - field2850 = new ServerPacket(63, 6); - field2851 = new ServerPacket(64, 6); - field2852 = new ServerPacket(65, 3); - field2853 = new ServerPacket(66, 6); - field2861 = new ServerPacket(67, -2); - field2855 = new ServerPacket(68, 2); - field2848 = new ServerPacket(69, -2); - field2857 = new ServerPacket(70, -2); - field2858 = new ServerPacket(71, 4); - field2859 = new ServerPacket(72, 0); - field2860 = new ServerPacket(73, -2); - field2824 = new ServerPacket(74, 1); - field2874 = new ServerPacket(75, 0); - field2863 = new ServerPacket(76, 8); - field2864 = new ServerPacket(77, -1); - field2856 = new ServerPacket(78, 12); - field2800 = new ServerPacket(79, 6); - field2867 = new ServerPacket(80, 6); - field2868 = new ServerPacket(81, 5); - field2866 = new ServerPacket(82, 28); - field2870 = new ServerPacket(83, 1); - field2871 = new ServerPacket(84, 8); - field2872 = new ServerPacket(85, 15); - field2873 = new ServerPacket(86, -1); - field2842 = new ServerPacket(87, -2); - field2875 = new ServerPacket(88, 1); - field2876 = new ServerPacket(89, 2); - field2877 = new ServerPacket(90, -2); - field2854 = new ServerPacket(91, 0); - field2837 = new ServerPacket(92, -1); - field2880 = new ServerPacket(93, -2); - field2881 = new ServerPacket(94, -2); + field2796 = new ServerPacket(0, -1); // L: 5 + field2874 = new ServerPacket(1, -2); // L: 6 + field2863 = new ServerPacket(2, -2); // L: 7 + field2865 = new ServerPacket(3, -1); // L: 8 + field2821 = new ServerPacket(4, -2); // L: 9 + field2797 = new ServerPacket(5, 1); // L: 10 + field2798 = new ServerPacket(6, 2); // L: 11 + field2799 = new ServerPacket(7, -1); // L: 12 + field2853 = new ServerPacket(8, -2); // L: 13 + field2801 = new ServerPacket(9, -1); // L: 14 + field2802 = new ServerPacket(10, 3); // L: 15 + field2803 = new ServerPacket(11, -2); // L: 16 + field2804 = new ServerPacket(12, 5); // L: 17 + field2805 = new ServerPacket(13, 2); // L: 18 + field2870 = new ServerPacket(14, 0); // L: 19 + field2807 = new ServerPacket(15, -2); // L: 20 + field2808 = new ServerPacket(16, 4); // L: 21 + field2809 = new ServerPacket(17, 7); // L: 22 + field2810 = new ServerPacket(18, 2); // L: 23 + field2855 = new ServerPacket(19, 4); // L: 24 + field2812 = new ServerPacket(20, 15); // L: 25 + field2813 = new ServerPacket(21, 28); // L: 26 + field2814 = new ServerPacket(22, 1); // L: 27 + field2815 = new ServerPacket(23, 6); // L: 28 + field2878 = new ServerPacket(24, -1); // L: 29 + field2817 = new ServerPacket(25, -2); // L: 30 + field2818 = new ServerPacket(26, 6); // L: 31 + field2852 = new ServerPacket(27, 6); // L: 32 + field2820 = new ServerPacket(28, -2); // L: 33 + field2831 = new ServerPacket(29, 6); // L: 34 + field2822 = new ServerPacket(30, 2); // L: 35 + field2823 = new ServerPacket(31, 5); // L: 36 + field2824 = new ServerPacket(32, 3); // L: 37 + field2825 = new ServerPacket(33, 10); // L: 38 + field2826 = new ServerPacket(34, 6); // L: 39 + field2827 = new ServerPacket(35, -1); // L: 40 + field2828 = new ServerPacket(36, 8); // L: 41 + field2829 = new ServerPacket(37, -1); // L: 42 + field2830 = new ServerPacket(38, -2); // L: 43 + field2887 = new ServerPacket(39, 2); // L: 44 + field2880 = new ServerPacket(40, 6); // L: 45 + field2833 = new ServerPacket(41, 6); // L: 46 + field2834 = new ServerPacket(42, 8); // L: 47 + field2835 = new ServerPacket(43, 4); // L: 48 + field2836 = new ServerPacket(44, 2); // L: 49 + field2837 = new ServerPacket(45, -2); // L: 50 + field2838 = new ServerPacket(46, -2); // L: 51 + field2839 = new ServerPacket(47, -2); // L: 52 + field2840 = new ServerPacket(48, 2); // L: 53 + field2841 = new ServerPacket(49, 1); // L: 54 + field2842 = new ServerPacket(50, 8); // L: 55 + field2843 = new ServerPacket(51, 6); // L: 56 + field2844 = new ServerPacket(52, 0); // L: 57 + field2845 = new ServerPacket(53, -2); // L: 58 + field2846 = new ServerPacket(54, -2); // L: 59 + field2800 = new ServerPacket(55, -2); // L: 60 + field2885 = new ServerPacket(56, -2); // L: 61 + field2849 = new ServerPacket(57, 7); // L: 62 + field2850 = new ServerPacket(58, 6); // L: 63 + field2811 = new ServerPacket(59, -2); // L: 64 + field2793 = new ServerPacket(60, 0); // L: 65 + field2847 = new ServerPacket(61, 4); // L: 66 + field2795 = new ServerPacket(62, 10); // L: 67 + field2859 = new ServerPacket(63, -2); // L: 68 + field2856 = new ServerPacket(64, 0); // L: 69 + field2857 = new ServerPacket(65, -2); // L: 70 + field2858 = new ServerPacket(66, 4); // L: 71 + field2806 = new ServerPacket(67, 6); // L: 72 + field2860 = new ServerPacket(68, -1); // L: 73 + field2861 = new ServerPacket(69, 2); // L: 74 + field2872 = new ServerPacket(70, 4); // L: 75 + field2877 = new ServerPacket(71, 12); // L: 76 + field2864 = new ServerPacket(72, 0); // L: 77 + field2851 = new ServerPacket(73, -2); // L: 78 + field2832 = new ServerPacket(74, 1); // L: 79 + field2867 = new ServerPacket(75, 1); // L: 80 + field2868 = new ServerPacket(76, 0); // L: 81 + field2869 = new ServerPacket(77, 2); // L: 82 + field2819 = new ServerPacket(78, 0); // L: 83 + field2871 = new ServerPacket(79, 5); // L: 84 + field2792 = new ServerPacket(80, -2); // L: 85 + field2873 = new ServerPacket(81, 14); // L: 86 + field2890 = new ServerPacket(82, 20); // L: 87 + field2862 = new ServerPacket(83, 5); // L: 88 + field2876 = new ServerPacket(84, 6); // L: 89 + field2875 = new ServerPacket(85, 1); // L: 90 + field2816 = new ServerPacket(86, -1); // L: 91 + field2879 = new ServerPacket(87, 0); // L: 92 + field2882 = new ServerPacket(88, 0); // L: 93 + field2881 = new ServerPacket(89, -2); // L: 94 + field2794 = new ServerPacket(90, 4); // L: 95 + field2883 = new ServerPacket(91, 2); // L: 96 + field2884 = new ServerPacket(92, -2); // L: 97 + field2886 = new ServerPacket(93, 8); // L: 98 + field2854 = new ServerPacket(94, 5); // L: 99 + field2892 = new ServerPacket(95, -2); // L: 100 + field2888 = new ServerPacket(96, -2); // L: 101 } ServerPacket(int var1, int var2) { - this.id = var1; - this.length = var2; - } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "1488688652" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != VertexNormal.Client_plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = PlayerComposition.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = PlayerComposition.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = PlayerComposition.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = PlayerComposition.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { - var12 = PlayerComposition.scene.getObjectFlags(var0, var2, var3, var7); - int var14 = InterfaceParent.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectComposition var13; - if (var1 == 0) { - PlayerComposition.scene.removeBoundaryObject(var0, var2, var3); - var13 = class245.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3388(var2, var3, var15, var16, var13.boolean1); - } - } - - if (var1 == 1) { - PlayerComposition.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - PlayerComposition.scene.removeGameObject(var0, var2, var3); - var13 = class245.getObjectDefinition(var14); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { - PlayerComposition.scene.removeFloorDecoration(var0, var2, var3); - var13 = class245.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3391(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - class115.method2495(var0, var12, var2, var3, var4, var5, var6, PlayerComposition.scene, Client.collisionMaps[var0]); - } - } - - } + this.id = var1; // L: 110 + this.length = var2; // L: 111 + } // L: 112 } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 34a127cd5c..cd43d3cdfb 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -2,84 +2,56 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("ha") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lac;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("cw") - public static char field2376; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("l") + @ObfuscatedName("tv") @ObfuscatedGetter( - intValue = 140669593 + intValue = -946798709 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1178553901 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -818379809 + intValue = -1443695477 ) @Export("count") int count; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("labels") int[][] labels; Skeleton(int var1, byte[] var2) { - this.id = var1; - Buffer var3 = new Buffer(var2); - this.count = var3.readUnsignedByte(); - this.transformTypes = new int[this.count]; - this.labels = new int[this.count][]; + this.id = var1; // L: 13 + Buffer var3 = new Buffer(var2); // L: 14 + this.count = var3.readUnsignedByte(); // L: 15 + this.transformTypes = new int[this.count]; // L: 16 + this.labels = new int[this.count][]; // L: 17 int var4; - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 18 this.transformTypes[var4] = var3.readUnsignedByte(); } - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 19 this.labels[var4] = new int[var3.readUnsignedByte()]; } - for (var4 = 0; var4 < this.count; ++var4) { - for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 20 + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 21 this.labels[var4][var5] = var3.readUnsignedByte(); } } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)[Lpa;", - garbageValue = "-1301198284" - ) - static PrivateChatMode[] method4196() { - return new PrivateChatMode[]{PrivateChatMode.field4412, PrivateChatMode.field4413, PrivateChatMode.field4411}; - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1116074863" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } + } // L: 23 } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a25dd2c288..9273f8992b 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,54 +1,50 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("ji") @Implements("Skills") public class Skills { - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -83485713 + @ObfuscatedName("mg") + @ObfuscatedSignature( + descriptor = "Ljf;" ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; + static Widget field3247; 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}; - Skills_experienceTable = new int[99]; - int var0 = 0; + 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 - 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; + 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 } - } + } // L: 16 - @ObfuscatedName("jd") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljt;IIII)V", - garbageValue = "-618613054" + descriptor = "(CI)Z", + garbageValue = "-1228711203" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - class4.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); - } - + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 205 + return true; + } else if (var0 >= 160 && var0 <= 255) { // L: 206 + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 207 } } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index dcebd97239..138068b90d 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,27 +3,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("if") +@ObfuscatedName("ix") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("ref") SoftReference ref; SoftWrapper(Object var1, int var2) { - super(var2); - this.ref = new SoftReference(var1); - } + super(var2); // L: 10 + this.ref = new SoftReference(var1); // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("get") Object get() { - return this.ref.get(); + return this.ref.get(); // L: 15 } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isSoft") boolean isSoft() { - return true; + return true; // L: 19 } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 5bb71c388f..3458e74c60 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,94 +1,92 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("at") +@ObfuscatedName("ad") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;)V" + descriptor = "(Lko;Lko;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { - this.musicSamples = new NodeHashTable(256); - this.rawSounds = new NodeHashTable(256); - this.soundEffectIndex = var1; - this.musicSampleIndex = 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II[II)Laa;", - garbageValue = "-708728075" + descriptor = "(II[IS)Laz;", + garbageValue = "-5017" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - 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) { + 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 return var7; - } else if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { // L: 23 return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); - if (var8 == null) { + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 + if (var8 == null) { // L: 25 return null; } else { - var7 = var8.toRawSound(); - this.rawSounds.put(var7, var5); + var7 = var8.toRawSound(); // L: 26 + this.rawSounds.put(var7, var5); // L: 27 if (var3 != null) { - var3[0] -= var7.samples.length; + var3[0] -= var7.samples.length; // L: 28 } - return var7; + return var7; // L: 29 } } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II[II)Laa;", - garbageValue = "-195355299" + descriptor = "(II[IB)Laz;", + garbageValue = "-25" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); - var4 |= var1 << 16; - long var5 = (long)var4 ^ 4294967296L; + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33 + var4 |= var1 << 16; // L: 34 + long var5 = (long)var4 ^ 4294967296L; // L: 35 RawSound var7 = (RawSound)this.rawSounds.get(var5); if (var7 != null) { return var7; @@ -109,33 +107,33 @@ public class SoundCache { if (var7 == null) { return null; } else { - var8.remove(); + var8.remove(); // L: 47 this.rawSounds.put(var7, var5); return var7; } } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I[IB)Laa;", - garbageValue = "-74" + descriptor = "(I[II)Laz;", + garbageValue = "-1852597281" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if (this.soundEffectIndex.getGroupCount() == 1) { + if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 return this.getSoundEffect0(0, var1, var2); } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { - return this.getSoundEffect0(var1, 0, var2); + return this.getSoundEffect0(var1, 0, var2); // L: 54 } else { throw new RuntimeException(); } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I[IB)Laa;", - garbageValue = "79" + descriptor = "(I[IB)Laz;", + garbageValue = "-64" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -144,454 +142,216 @@ public class SoundCache { } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { return this.getMusicSample0(var1, 0, var2); } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 61 } } - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Loy;B)V", - garbageValue = "-6" + descriptor = "(I)J", + garbageValue = "-566030562" ) - static final void method781(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { - int var2 = Players.Players_pendingUpdateIndices[var1]; - Player var3 = Client.players[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 64) != 0) { - var4 += var0.readUnsignedByte() << 8; - } + static long method807() { + try { + URL var0 = new URL(HealthBar.method2246("services", false) + "m=accountappeal/login.ws"); // L: 36 + URLConnection var1 = var0.openConnection(); // L: 37 + var1.setRequestProperty("connection", "close"); // L: 38 + var1.setDoInput(true); // L: 39 + var1.setDoOutput(true); // L: 40 + var1.setConnectTimeout(5000); // L: 41 + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42 + var2.write("data1=req"); // L: 43 + var2.flush(); // L: 44 + InputStream var3 = var1.getInputStream(); // L: 45 + Buffer var4 = new Buffer(new byte[1000]); // L: 46 - Player.method2133(var0, var2, var3, var4); - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)Lon;", - garbageValue = "70" - ) - static SpritePixels method784() { - SpritePixels var0 = new SpritePixels(); - var0.width = class414.SpriteBuffer_spriteWidth; - var0.height = class408.SpriteBuffer_spriteHeight; - var0.xOffset = class135.SpriteBuffer_xOffsets[0]; - var0.yOffset = class131.SpriteBuffer_yOffsets[0]; - var0.subWidth = class414.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class16.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subWidth * var0.subHeight; - byte[] var2 = class414.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class351.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - StudioGame.method5130(); - return var0; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "9" - ) - public static int method771(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } - - return var2; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "704557990" - ) - static int method780(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { - var7 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - GraphicsDefaults.addGameMessage(0, "", var7); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - SpotAnimationDefinition.performPlayerAnimation(class67.localPlayer, Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize], Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field832) { - Interpreter.field828 = true; - } - - return 1; - } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var16 = 0; - if (LoginType.isNumber(var7)) { - var16 = class279.method5134(var7); + do { + int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 + if (var5 == -1) { // L: 49 + var4.offset = 0; // L: 55 + long var7 = var4.readLong(); // L: 56 + return var7; // L: 57 } - PacketBufferNode var14 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2742, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeInt(var16); - Client.packetWriter.addNode(var14); - return 1; + var4.offset += var5; // L: 50 + } while(var4.offset < 1000); // L: 51 + + return 0L; // L: 52 + } catch (Exception var9) { // L: 59 + return 0L; // L: 60 + } + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-1520493617" + ) + static int method799(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2502 + if (class67.guestClanSettings != null) { // L: 2503 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2504 + SoundSystem.field287 = class67.guestClanSettings; // L: 2505 } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2666, 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[--class54.Interpreter_stringStackSize]; - var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2741, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var7.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var12); - return 1; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2507 + } + + return 1; // L: 2508 + } else { + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2510 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2511 + if (Client.currentClanSettings[var3] != null) { // L: 2512 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2513 + SoundSystem.field287 = Client.currentClanSettings[var3]; // L: 2514 } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - class10.method104(var10, var4); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var10 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - Widget var15 = HealthBarUpdate.getWidget(var9); - GrandExchangeEvents.clickWidget(var15, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Widget var13 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - GrandExchangeEvents.clickWidget(var13, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - VarbitComposition.mouseCam = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapDecorationType.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - WorldMapDecorationType.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - ScriptFrame.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - boolean var8 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - LoginScreenAnimation.openURL(var7, var8, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class54.Interpreter_stringStackSize -= 2; - var4 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - if (var4.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2516 + } + + return 1; // L: 2517 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2519 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.name; // L: 2520 + return 1; // L: 2521 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2523 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.allowGuests ? 1 : 0; // L: 2524 + return 1; // L: 2525 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2527 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1444; // L: 2528 + return 1; // L: 2529 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2531 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1439; // L: 2532 + return 1; // L: 2533 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2535 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1446; // L: 2536 + return 1; // L: 2537 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2539 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1447; // L: 2540 + return 1; // L: 2541 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2543 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.memberCount; // L: 2544 + return 1; // L: 2545 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2547 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2548 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.memberNames[var3]; // L: 2549 + return 1; // L: 2550 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2552 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2553 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.memberRanks[var3]; // L: 2554 + return 1; // L: 2555 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2557 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.bannedMemberCount; // L: 2558 + return 1; // L: 2559 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2561 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2562 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.bannedMemberNames[var3]; // L: 2563 + return 1; // L: 2564 + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2566 + class14.Interpreter_intStackSize -= 3; // L: 2567 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2568 + var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2569 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2570 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.method2652(var3, var6, var5); // L: 2571 + return 1; // L: 2572 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2574 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.currentOwner; // L: 2575 + return 1; // L: 2576 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2578 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1438; // L: 2579 + return 1; // L: 2580 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2582 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.method2649(Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 2583 + return 1; // L: 2584 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2586 + Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = SoundSystem.field287.getSortedMembers()[Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1]]; // L: 2587 + return 1; // L: 2588 + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2590 + class14.Interpreter_intStackSize -= 2; // L: 2591 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2592 + var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2593 + class20.method298(var6, var3); // L: 2594 + return 1; // L: 2595 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2597 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2598 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1453[var3]; // L: 2599 + return 1; // L: 2600 + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2602 + class14.Interpreter_intStackSize -= 3; // L: 2603 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2604 + boolean var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 2605 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2606 + VarpDefinition.method3003(var5, var3, var4); // L: 2607 + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2609 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2610 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1454[var3] ? 1 : 0; // L: 2611 + return 1; // L: 2612 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2614 + if (class115.guestClanChannel != null) { // L: 2615 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2616 + WorldMapRegion.field2069 = class115.guestClanChannel; // L: 2617 } else { - PacketBufferNode var6 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2679, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class113.stringCp1252NullTerminatedByteSize(var4) + class113.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - var6.packetBuffer.method7066(var10); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2619 } - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; + return 1; // L: 2620 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2622 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2623 + if (Client.currentClanChannels[var3] != null) { // L: 2624 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2625 + WorldMapRegion.field2069 = Client.currentClanChannels[var3]; // L: 2626 + class133.field1499 = var3; // L: 2627 } else { - Client.drawPlayerNames &= -3; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2629 } - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - Skeleton.setTapToDrop(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapSection0.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Huffman.canvasWidth; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = MouseRecorder.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field509 = 3; - Client.field673 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field509 = 2; - Client.field673 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field509 = 0; - return 1; - } else if (var0 == 3139) { - Client.field509 = 1; - return 1; - } else if (var0 == 3140) { - Client.field509 = 3; - Client.field673 = var2 ? WorldMapDecoration.scriptDotWidget.id * -1239763633 * 1169899951 : class245.scriptActiveWidget.id * -1239763633 * 1169899951; - return 1; + return 1; // L: 2630 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2632 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = WorldMapRegion.field2069.name; // L: 2633 + return 1; // L: 2634 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2636 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.field1511; // L: 2637 + return 1; // L: 2638 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2640 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.field1516; // L: 2641 + return 1; // L: 2642 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2644 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.method2809(); // L: 2645 + return 1; // L: 2646 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2648 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2649 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).username.getName(); // L: 2650 + return 1; // L: 2651 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2653 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2654 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).rank; // L: 2655 + return 1; // L: 2656 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2658 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2659 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).world; // L: 2660 + return 1; // L: 2661 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2663 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2664 + HitSplatDefinition.method3267(class133.field1499, var3); // L: 2665 + return 1; // L: 2666 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2668 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.method2817(Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 2669 + return 1; // L: 2670 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2672 + Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.getSortedMembers()[Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1]]; // L: 2673 + return 1; // L: 2674 + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2676 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = NPC.field1210 != null ? 1 : 0; // L: 2677 + return 1; // L: 2678 } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - WorldMapDecorationType.clientPreferences.hideUsername = var11; - ScriptFrame.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapDecorationType.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var11; - if (!var11) { - WorldMapDecorationType.clientPreferences.rememberedUsername = ""; - ScriptFrame.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; - } else if (var0 == 3146) { - var11 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (var11 == WorldMapDecorationType.clientPreferences.titleMusicDisabled) { - WorldMapDecorationType.clientPreferences.titleMusicDisabled = !var11; - ScriptFrame.savePreferences(); - } - - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapDecorationType.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class7.method56(); - return 1; - } else if (var0 == 3155) { - --class54.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class54.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class54.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class54.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize], 0), 100); - class268.method5105((double)((float)var10 / 200.0F + 0.5F)); - return 1; - } else if (var0 == 3182) { - float var3 = 200.0F * ((float)WorldMapDecorationType.clientPreferences.brightness - 0.5F); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 100 - Math.round(var3); - return 1; - } else if (var0 != 3183 && var0 != 3184) { - return 2; - } else { - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } + return 2; // L: 2680 } } } } } - - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1813767537" - ) - static final void method768() { - if (KitDefinition.field1665) { - class245.method4681(); - KitDefinition.field1665 = false; - } - - } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index e0ba6e07b7..d37a115832 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,132 +3,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("at") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lbz;" + descriptor = "[Lbg;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("start") int start; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) SoundEffect(Buffer var1) { - this.instruments = new Instrument[10]; + this.instruments = new Instrument[10]; // L: 10 - 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); + 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 } } - this.start = var1.readUnsignedShort(); - this.end = var1.readUnsignedShort(); - } + this.start = var1.readUnsignedShort(); // L: 28 + this.end = var1.readUnsignedShort(); // L: 29 + } // L: 30 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Laa;" + descriptor = "()Laz;" ) @Export("toRawSound") public RawSound toRawSound() { - byte[] var1 = this.mix(); - return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); + byte[] var1 = this.mix(); // L: 33 + return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("calculateDelay") public final int calculateDelay() { - int var1 = 9999999; + int var1 = 9999999; // L: 38 int var2; - for (var2 = 0; var2 < 10; ++var2) { - if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { + for (var2 = 0; var2 < 10; ++var2) { // L: 39 + if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { // L: 40 41 var1 = this.instruments[var2].offset / 20; } } - if (this.start < this.end && this.start / 20 < var1) { + if (this.start < this.end && this.start / 20 < var1) { // L: 44 var1 = this.start / 20; } - if (var1 != 9999999 && var1 != 0) { - for (var2 = 0; var2 < 10; ++var2) { + if (var1 != 9999999 && var1 != 0) { // L: 45 + for (var2 = 0; var2 < 10; ++var2) { // L: 46 if (this.instruments[var2] != null) { Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; + var10000.offset -= var1 * 20; // L: 47 } } - if (this.start < this.end) { - this.start -= var1 * 20; - this.end -= var1 * 20; + if (this.start < this.end) { // L: 49 + this.start -= var1 * 20; // L: 50 + this.end -= var1 * 20; // L: 51 } - return var1; + return var1; // L: 53 } else { return 0; } } - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("mix") final byte[] mix() { - int var1 = 0; + int var1 = 0; // L: 57 int var2; - for (var2 = 0; var2 < 10; ++var2) { - if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { + 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 var1 = this.instruments[var2].duration + this.instruments[var2].offset; } } - if (var1 == 0) { + if (var1 == 0) { // L: 63 return new byte[0]; } else { - var2 = var1 * 22050 / 1000; - byte[] var3 = new byte[var2]; + var2 = var1 * 22050 / 1000; // L: 64 + byte[] var3 = new byte[var2]; // L: 65 - 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 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 var8 = 0; var8 < var5; ++var8) { - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; - if ((var9 + 128 & -256) != 0) { + 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 var9 = var9 >> 31 ^ 127; } - var3[var8 + var6] = (byte)var9; + var3[var8 + var6] = (byte)var9; // L: 74 } } } - return var3; + return var3; // L: 78 } } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;II)Lau;" + descriptor = "(Lko;II)Lat;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new SoundEffect(new Buffer(var3)); + byte[] var3 = var0.takeFile(var1, var2); // L: 15 + return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 51bba9516c..a8c8a2d842 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,37 +3,37 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("ab") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("segments") int segments; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("durations") int[] durations; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("phases") int[] phases; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("start") int start; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("form") int form; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("ticks") int ticks; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("step") int step; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("amplitude") int amplitude; @ObfuscatedName("y") @@ -41,71 +41,71 @@ public class SoundEnvelope { int max; SoundEnvelope() { - 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; - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) @Export("decode") final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); - this.start = var1.readInt(); - this.end = var1.readInt(); - this.decodeSegments(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 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); - this.durations = new int[this.segments]; - this.phases = new int[this.segments]; + this.segments = var1.readUnsignedByte(); // L: 38 + this.durations = new int[this.segments]; // L: 39 + this.phases = new int[this.segments]; // L: 40 - for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.readUnsignedShort(); - this.phases[var2] = var1.readUnsignedShort(); + for (int var2 = 0; var2 < this.segments; ++var2) { // L: 41 + this.durations[var2] = var1.readUnsignedShort(); // L: 42 + this.phases[var2] = var1.readUnsignedShort(); // L: 43 } - } + } // L: 45 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("reset") final void reset() { - this.ticks = 0; - this.phaseIndex = 0; - this.step = 0; - this.amplitude = 0; - this.max = 0; - } + 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 - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("doStep") final int doStep(int var1) { - if (this.max >= this.ticks) { - this.amplitude = this.phases[this.phaseIndex++] << 15; - if (this.phaseIndex >= this.segments) { + if (this.max >= this.ticks) { // L: 56 + this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 + if (this.phaseIndex >= this.segments) { // L: 58 this.phaseIndex = this.segments - 1; } - this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); - if (this.ticks > this.max) { + this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); // L: 59 + if (this.ticks > this.max) { // L: 60 this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max); } } - this.amplitude += this.step; - ++this.max; - return this.amplitude - this.step >> 15; + this.amplitude += this.step; // L: 62 + ++this.max; // L: 63 + return this.amplitude - this.step >> 15; // L: 64 } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 08870a3df5..bbe2c7d575 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,698 +1,527 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ac") +@ObfuscatedName("ar") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("l") + @ObfuscatedName("sb") + @ObfuscatedGetter( + intValue = 1952022621 + ) + static int field288; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Laq;" + descriptor = "Lle;" + ) + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Ldm;" + ) + static ClanSettings field287; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 580143713 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Lak;" ) @Export("players") volatile PcmPlayer[] players; SoundSystem() { - this.players = new PcmPlayer[2]; - } + this.players = new PcmPlayer[2]; // L: 6 + } // L: 8 public void run() { try { for (int var1 = 0; var1 < 2; ++var1) { - PcmPlayer var2 = this.players[var1]; + PcmPlayer var2 = this.players[var1]; // L: 13 if (var2 != null) { var2.run(); } } } catch (Exception var4) { - Timer.RunException_sendStackTrace((String)null, var4); + MilliClock.RunException_sendStackTrace((String)null, var4); } - } + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "1269217196" + descriptor = "(IIIIIII)I", + garbageValue = "1003553351" ) - public static String method759(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var10 = var0[var1]; - return var10 == null ? "null" : var10.toString(); + public static int method780(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 + } + + var2 &= 3; // L: 14 + if (var2 == 0) { // L: 15 + return var0; + } else if (var2 == 1) { // L: 16 + return var1; } else { - int var3 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var3; ++var5) { - CharSequence var9 = var0[var5]; - if (var9 == null) { - var4 += 4; - } else { - var4 += var9.length(); - } - } - - StringBuilder var8 = new StringBuilder(var4); - - for (int var6 = var1; var6 < var3; ++var6) { - CharSequence var7 = var0[var6]; - if (var7 == null) { - var8.append("null"); - } else { - var8.append(var7); - } - } - - return var8.toString(); + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 17 18 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lcy;III)V", - garbageValue = "-1352565651" + descriptor = "(Lck;IIB)V", + garbageValue = "-35" ) @Export("runScript") static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; + Object[] var3 = var0.args; // L: 114 Script var4; int var20; - if (AbstractWorldMapIcon.isWorldMapEvent(var0.type)) { - class130.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = class13.WorldMapElement_get(class130.worldMapEvent.mapElement); - var4 = class196.getWorldMapScript(var0.type, var5.objectId, var5.category); + if (class6.isWorldMapEvent(var0.type)) { // L: 116 + class7.worldMapEvent = (WorldMapEvent)var3[0]; // L: 117 + WorldMapElement var5 = ItemComposition.WorldMapElement_get(class7.worldMapEvent.mapElement); // L: 118 + var4 = ObjectSound.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 119 } else { - var20 = (Integer)var3[0]; - var4 = class1.getScript(var20); + var20 = (Integer)var3[0]; // L: 122 + var4 = InvDefinition.getScript(var20); // L: 123 } - if (var4 != null) { - AbstractByteArrayCopier.Interpreter_intStackSize = 0; - class54.Interpreter_stringStackSize = 0; - var20 = -1; - int[] var6 = var4.opcodes; - int[] var7 = var4.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field828 = false; - boolean var9 = false; - int var10 = 0; + if (var4 != null) { // L: 125 + class14.Interpreter_intStackSize = 0; // L: 128 + class295.Interpreter_stringStackSize = 0; // L: 129 + var20 = -1; // L: 130 + int[] var6 = var4.opcodes; // L: 131 + int[] var7 = var4.intOperands; // L: 132 + byte var8 = -1; // L: 133 + Interpreter.Interpreter_frameDepth = 0; // L: 134 + Interpreter.field795 = false; // L: 135 + boolean var9 = false; // L: 136 + int var10 = 0; // L: 137 boolean var30 = false; - label985: { - label986: { + label989: { + label990: { try { int var13; try { - var30 = true; - class12.Interpreter_intLocals = new int[var4.localIntCount]; - int var11 = 0; - WorldMapID.Interpreter_stringLocals = new String[var4.localStringCount]; + var30 = true; // L: 139 + class28.Interpreter_intLocals = new int[var4.localIntCount]; // L: 140 + int var11 = 0; // L: 141 + UserComparator7.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 142 int var12 = 0; int var14; String var21; - for (var13 = 1; var13 < var3.length; ++var13) { - if (var3[var13] instanceof Integer) { - var14 = (Integer)var3[var13]; - if (var14 == -2147483647) { + for (var13 = 1; var13 < var3.length; ++var13) { // L: 143 + if (var3[var13] instanceof Integer) { // L: 144 + var14 = (Integer)var3[var13]; // L: 145 + if (var14 == -2147483647) { // L: 146 var14 = var0.mouseX; } - if (var14 == -2147483646) { + if (var14 == -2147483646) { // L: 147 var14 = var0.mouseY; } - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * -1239763633 * 1169899951 : -1; + if (var14 == -2147483645) { // L: 148 + var14 = var0.widget != null ? var0.widget.id * 851670683 * -830177389 : -1; } - if (var14 == -2147483644) { + if (var14 == -2147483644) { // L: 149 var14 = var0.opIndex; } - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * -583467391 * -886488703 : -1; + if (var14 == -2147483643) { // L: 150 + var14 = var0.widget != null ? var0.widget.childIndex * 855382617 * -349073943 : -1; } - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * -1239763633 * 1169899951 : -1; + if (var14 == -2147483642) { // L: 151 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 851670683 * -830177389 : -1; } - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -583467391 * -886488703 : -1; + if (var14 == -2147483641) { // L: 152 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 855382617 * -349073943 : -1; } - if (var14 == -2147483640) { + if (var14 == -2147483640) { // L: 153 var14 = var0.keyTyped; } - if (var14 == -2147483639) { + if (var14 == -2147483639) { // L: 154 var14 = var0.keyPressed; } - class12.Interpreter_intLocals[var11++] = var14; - } else if (var3[var13] instanceof String) { - var21 = (String)var3[var13]; - if (var21.equals("event_opbase")) { + class28.Interpreter_intLocals[var11++] = var14; // L: 155 + } else if (var3[var13] instanceof String) { // L: 157 + var21 = (String)var3[var13]; // L: 158 + if (var21.equals("event_opbase")) { // L: 159 var21 = var0.targetName; } - WorldMapID.Interpreter_stringLocals[var12++] = var21; + UserComparator7.Interpreter_stringLocals[var12++] = var21; // L: 160 } } - Interpreter.field818 = var0.field1037; + Interpreter.field798 = var0.field1024; // L: 164 while (true) { - ++var10; - if (var10 > var1) { + ++var10; // L: 166 + if (var10 > var1) { // L: 167 throw new RuntimeException(); } - ++var20; + ++var20; // L: 168 int var33 = var6[var20]; - if (var33 >= 100) { + if (var33 >= 100) { // L: 169 boolean var35; - if (var4.intOperands[var20] == 1) { + if (var4.intOperands[var20] == 1) { // L: 387 var35 = true; } else { - var35 = false; + var35 = false; // L: 388 } - var14 = class124.method2564(var33, var4, var35); - switch(var14) { + var14 = AbstractWorldMapIcon.method4026(var33, var4, var35); // L: 389 + switch(var14) { // L: 390 case 0: var30 = false; - break label985; + break label990; case 1: default: break; case 2: - throw new IllegalStateException(); + throw new IllegalStateException(); // L: 393 } - } else if (var33 == 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7[var20]; - } else if (var33 == ScriptOpcodes.GET_VARP) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var33 == ScriptOpcodes.SET_VARP) { - var13 = var7[var20]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - NetSocket.changeGameOptions(var13); - } else if (var33 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; - } else if (var33 == ScriptOpcodes.JUMP) { - var20 += var7[var20]; - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + } else if (var33 == 0) { // L: 170 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7[var20]; // L: 171 + } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 174 + var13 = var7[var20]; // L: 175 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 176 + } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 179 + var13 = var7[var20]; // L: 180 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 181 + WorldMapLabelSize.changeGameOptions(var13); // L: 182 + } else if (var33 == ScriptOpcodes.SCONST) { // L: 185 + Interpreter.Interpreter_stringStack[++class295.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 + class14.Interpreter_intStackSize -= 2; // L: 194 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 195 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 198 + class14.Interpreter_intStackSize -= 2; // L: 199 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 200 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 203 + class14.Interpreter_intStackSize -= 2; // L: 204 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 205 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 208 + class14.Interpreter_intStackSize -= 2; // L: 209 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 210 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { + } else if (var33 == ScriptOpcodes.RETURN) { // L: 213 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 214 var30 = false; - break label986; + break; } - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var4 = var40.script; - var6 = var4.opcodes; - var7 = var4.intOperands; - var20 = var40.pc; - class12.Interpreter_intLocals = var40.intLocals; - WorldMapID.Interpreter_stringLocals = var40.stringLocals; - } else if (var33 == ScriptOpcodes.GET_VARBIT) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Varcs.getVarbit(var13); - } else if (var33 == ScriptOpcodes.SET_VARBIT) { - var13 = var7[var20]; - MouseRecorder.method2078(var13, Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + 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 + class28.Interpreter_intLocals = var40.intLocals; // L: 220 + UserComparator7.Interpreter_stringLocals = var40.stringLocals; // L: 221 + } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 224 + var13 = var7[var20]; // L: 225 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class119.getVarbit(var13); // L: 226 + } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 229 + var13 = var7[var20]; // L: 230 + class123.method2616(var13, Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 231 + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 234 + class14.Interpreter_intStackSize -= 2; // L: 235 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 236 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]) { + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 239 + class14.Interpreter_intStackSize -= 2; // L: 240 + if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 241 var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class12.Interpreter_intLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.ISTORE) { - class12.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - } else if (var33 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = WorldMapID.Interpreter_stringLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.SSTORE) { - WorldMapID.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - } else if (var33 == ScriptOpcodes.JOIN_STRING) { - var13 = var7[var20]; - class54.Interpreter_stringStackSize -= var13; - var21 = method759(Interpreter.Interpreter_stringStack, class54.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var21; - } else if (var33 == ScriptOpcodes.POP_INT) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - } else if (var33 == ScriptOpcodes.POP_STRING) { - --class54.Interpreter_stringStackSize; + } else if (var33 == ScriptOpcodes.ILOAD) { // L: 244 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class28.Interpreter_intLocals[var7[var20]]; // L: 245 + } else if (var33 == ScriptOpcodes.ISTORE) { // L: 248 + class28.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 249 + } else if (var33 == ScriptOpcodes.SLOAD) { // L: 252 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = UserComparator7.Interpreter_stringLocals[var7[var20]]; // L: 253 + } else if (var33 == ScriptOpcodes.SSTORE) { // L: 256 + UserComparator7.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 257 + } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 260 + var13 = var7[var20]; // L: 261 + class295.Interpreter_stringStackSize -= var13; // L: 262 + var21 = DynamicObject.method2003(Interpreter.Interpreter_stringStack, class295.Interpreter_stringStackSize, var13); // L: 263 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var21; // L: 264 + } else if (var33 == ScriptOpcodes.POP_INT) { // L: 267 + --class14.Interpreter_intStackSize; // L: 268 + } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 271 + --class295.Interpreter_stringStackSize; // L: 272 } else { int var17; - if (var33 != ScriptOpcodes.INVOKE) { - if (var33 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Tile.varcs.getInt(var7[var20]); - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { - Tile.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { - var13 = var7[var20] >> 16; - var14 = var7[var20] & 65535; - int var24 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var24 < 0 || var24 > 5000) { - throw new RuntimeException(); + if (var33 != ScriptOpcodes.INVOKE) { // L: 275 + if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 298 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Message.varcs.getInt(var7[var20]); // L: 299 + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 302 + Message.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class14.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[--class14.Interpreter_intStackSize]; // L: 309 + if (var24 < 0 || var24 > 5000) { // L: 310 + throw new RuntimeException(); // L: 311 } - Interpreter.Interpreter_arrayLengths[var13] = var24; - byte var25 = -1; - if (var14 == 105) { + Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 313 + byte var25 = -1; // L: 314 + if (var14 == 105) { // L: 315 var25 = 0; } - for (var17 = 0; var17 < var24; ++var17) { + for (var17 = 0; var17 < var24; ++var17) { // L: 316 Interpreter.Interpreter_arrays[var13][var17] = var25; } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { - var13 = var7[var20]; - var14 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 319 + var13 = var7[var20]; // L: 320 + var14 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 321 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 322 + throw new RuntimeException(); // L: 323 } - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { - var13 = var7[var20]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 325 + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 328 + var13 = var7[var20]; // L: 329 + class14.Interpreter_intStackSize -= 2; // L: 330 + var14 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 331 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 332 + throw new RuntimeException(); // L: 333 } - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 335 } else { String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var22 = Tile.varcs.getStringOld(var7[var20]); - if (var22 == null) { + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 338 + var22 = Message.varcs.getStringOld(var7[var20]); // L: 339 + if (var22 == null) { // L: 340 var22 = "null"; } - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { - Tile.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { - var22 = Tile.varcs.getString(var7[var20]); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { - Tile.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.SWITCH) { - IterableNodeHashTable var38 = var4.switches[var7[var20]]; - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var37 != null) { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var22; // L: 341 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 344 + Message.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 345 + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 348 + var22 = Message.varcs.getString(var7[var20]); // L: 349 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var22; // L: 350 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 353 + Message.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class295.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[--class14.Interpreter_intStackSize]); // L: 359 + if (var37 != null) { // L: 360 var20 += var37.integer; } } else { Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { - var39 = ModeWhere.field3804.getTitleGroupValue(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 363 + var39 = field287.getTitleGroupValue(var7[var20]); // L: 364 + if (var39 == null) { // L: 365 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 366 } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var39; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var39; // L: 369 } } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { - throw new IllegalStateException(); + if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 373 + throw new IllegalStateException(); // L: 383 } - var39 = Coord.field3013.method6291(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; + var39 = NPC.field1210.method6379(var7[var20]); // L: 374 + if (var39 == null) { // L: 375 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 376 } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var39; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var39; // L: 379 } } } } } else { - var13 = var7[var20]; - Script var36 = class1.getScript(var13); - int[] var15 = new int[var36.localIntCount]; - String[] var16 = new String[var36.localStringCount]; + var13 = var7[var20]; // L: 276 + Script var36 = InvDefinition.getScript(var13); // L: 277 + int[] var15 = new int[var36.localIntCount]; // L: 278 + String[] var16 = new String[var36.localStringCount]; // L: 279 - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (AbstractByteArrayCopier.Interpreter_intStackSize - var36.intArgumentCount)]; + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 280 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class14.Interpreter_intStackSize - var36.intArgumentCount)]; } - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class54.Interpreter_stringStackSize - var36.stringArgumentCount)]; + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 281 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class295.Interpreter_stringStackSize - var36.stringArgumentCount)]; } - AbstractByteArrayCopier.Interpreter_intStackSize -= var36.intArgumentCount; - class54.Interpreter_stringStackSize -= var36.stringArgumentCount; - ScriptFrame var23 = new ScriptFrame(); - var23.script = var4; - var23.pc = var20; - var23.intLocals = class12.Interpreter_intLocals; - var23.stringLocals = WorldMapID.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; - var4 = var36; - var6 = var36.opcodes; - var7 = var36.intOperands; - var20 = -1; - class12.Interpreter_intLocals = var15; - WorldMapID.Interpreter_stringLocals = var16; + class14.Interpreter_intStackSize -= var36.intArgumentCount; // L: 282 + class295.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 283 + ScriptFrame var23 = new ScriptFrame(); // L: 284 + var23.script = var4; // L: 285 + var23.pc = var20; // L: 286 + var23.intLocals = class28.Interpreter_intLocals; // L: 287 + var23.stringLocals = UserComparator7.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 + class28.Interpreter_intLocals = var15; // L: 294 + UserComparator7.Interpreter_stringLocals = var16; // L: 295 } } } - } 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); - Timer.RunException_sendStackTrace(var27.toString(), var31); - var30 = false; - break; - } + } catch (Exception var31) { // L: 403 + var9 = true; // L: 404 + StringBuilder var27 = new StringBuilder(30); // L: 406 + var27.append("").append(var4.key).append(" "); // L: 407 + 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 + MilliClock.RunException_sendStackTrace(var27.toString(), var31); // L: 410 + var30 = false; + break label989; } } finally { if (var30) { - if (Interpreter.field828) { - Interpreter.field832 = true; + if (Interpreter.field795) { // L: 414 + Interpreter.field791 = true; // L: 415 } - while (Interpreter.field830.size() > 0) { - class92 var19 = (class92)Interpreter.field830.remove(0); - ReflectionCheck.widgetDefaultMenuAction(var19.method2243(), var19.method2254(), var19.method2242(), var19.method2245(), ""); + while (Interpreter.field797.size() > 0) { // L: 417 + class92 var19 = (class92)Interpreter.field797.remove(0); // L: 418 + GrandExchangeEvents.widgetDefaultMenuAction(var19.method2277(), var19.method2279(), var19.method2278(), var19.method2281(), ""); } - if (Interpreter.field832) { - WorldMapLabelSize.method3445(); - Interpreter.field832 = false; - Interpreter.field828 = false; + if (Interpreter.field791) { // L: 421 + class14.method191(); // L: 422 + Interpreter.field791 = false; // L: 423 + Interpreter.field795 = false; // L: 424 } if (!var9 && var2 > 0 && var10 >= var2) { - Timer.RunException_sendStackTrace("Warning: Script " + var4.field956 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } } } - if (Interpreter.field828) { - Interpreter.field832 = true; + if (Interpreter.field795) { + Interpreter.field791 = true; } - while (Interpreter.field830.size() > 0) { - class92 var26 = (class92)Interpreter.field830.remove(0); - ReflectionCheck.widgetDefaultMenuAction(var26.method2243(), var26.method2254(), var26.method2242(), var26.method2245(), ""); + while (Interpreter.field797.size() > 0) { + class92 var41 = (class92)Interpreter.field797.remove(0); + GrandExchangeEvents.widgetDefaultMenuAction(var41.method2277(), var41.method2279(), var41.method2278(), var41.method2281(), ""); } - if (Interpreter.field832) { - WorldMapLabelSize.method3445(); - Interpreter.field832 = false; - Interpreter.field828 = false; + if (Interpreter.field791) { + class14.method191(); + Interpreter.field791 = false; + Interpreter.field795 = false; } if (!var9 && var2 > 0 && var10 >= var2) { - Timer.RunException_sendStackTrace("Warning: Script " + var4.field956 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } return; } - if (Interpreter.field828) { - Interpreter.field832 = true; + if (Interpreter.field795) { + Interpreter.field791 = true; } - while (Interpreter.field830.size() > 0) { - class92 var41 = (class92)Interpreter.field830.remove(0); - ReflectionCheck.widgetDefaultMenuAction(var41.method2243(), var41.method2254(), var41.method2242(), var41.method2245(), ""); + while (Interpreter.field797.size() > 0) { + class92 var34 = (class92)Interpreter.field797.remove(0); + GrandExchangeEvents.widgetDefaultMenuAction(var34.method2277(), var34.method2279(), var34.method2278(), var34.method2281(), ""); // L: 419 } - if (Interpreter.field832) { - WorldMapLabelSize.method3445(); - Interpreter.field832 = false; - Interpreter.field828 = false; + if (Interpreter.field791) { + class14.method191(); + Interpreter.field791 = false; + Interpreter.field795 = false; } - if (!var9 && var2 > 0 && var10 >= var2) { - Timer.RunException_sendStackTrace("Warning: Script " + var4.field956 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + if (!var9 && var2 > 0 && var10 >= var2) { // L: 426 + MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 427 } return; } - if (Interpreter.field828) { - Interpreter.field832 = true; + if (Interpreter.field795) { + Interpreter.field791 = true; } - while (Interpreter.field830.size() > 0) { - class92 var34 = (class92)Interpreter.field830.remove(0); - ReflectionCheck.widgetDefaultMenuAction(var34.method2243(), var34.method2254(), var34.method2242(), var34.method2245(), ""); + while (Interpreter.field797.size() > 0) { + class92 var26 = (class92)Interpreter.field797.remove(0); + GrandExchangeEvents.widgetDefaultMenuAction(var26.method2277(), var26.method2279(), var26.method2278(), var26.method2281(), ""); } - if (Interpreter.field832) { - WorldMapLabelSize.method3445(); - Interpreter.field832 = false; - Interpreter.field828 = false; + if (Interpreter.field791) { + class14.method191(); + Interpreter.field791 = false; + Interpreter.field795 = false; } if (!var9 && var2 > 0 && var10 >= var2) { - Timer.RunException_sendStackTrace("Warning: Script " + var4.field956 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } } + } // L: 126 430 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1676514787" + ) + public static int method787(int var0) { + return class21.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 77 } - @ObfuscatedName("i") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "201810757" + descriptor = "(Ljf;IB)Ljava/lang/String;", + garbageValue = "-69" ) - static final int method758(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(Ljt;IIB)V", - garbageValue = "-106" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - GameBuild.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = GameEngine.Widget_getSpellActionName(var0); - if (var3 != null) { - GameBuild.insertMenuItemNoShift(var3, FloorUnderlayDefinition.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - GameBuild.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - GameBuild.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - GameBuild.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - GameBuild.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var13; - if (var0.type == 2) { - var13 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (int var15 = 0; var15 < var0.width; ++var15) { - int var6 = (var0.paddingX + 32) * var15; - int var7 = (var0.paddingY + 32) * var4; - if (var13 < 20) { - var6 += var0.inventoryXOffsets[var13]; - var7 += var0.inventoryYOffsets[var13]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var13; - Projectile.hoveredItemContainer = var0; - if (var0.itemIds[var13] > 0) { - ItemComposition var8 = class87.ItemDefinition_get(var0.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && Tiles.method2024(WorldMapRegion.getWidgetFlags(var0))) { - if (var0.id != UserComparator6.selectedItemWidget || var13 != ArchiveDiskAction.selectedItemSlot) { - GameBuild.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); - } - } else if (Client.isSpellSelected && Tiles.method2024(WorldMapRegion.getWidgetFlags(var0))) { - if ((ObjectComposition.selectedSpellFlags & 16) == 16) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); - } - } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop) { - boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - if (var11) { - var10 = var8.getShiftClickIndex(); - } - } - - int var16; - if (Tiles.method2024(WorldMapRegion.getWidgetFlags(var0))) { - for (var16 = 4; var16 >= 3; --var16) { - if (var16 != var10) { - AttackOption.addWidgetItemMenuItem(var0, var8, var13, var16, false); - } - } - } - - if (KeyHandler.method336(WorldMapRegion.getWidgetFlags(var0))) { - GameBuild.insertMenuItemNoShift("Use", FloorUnderlayDefinition.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); - } - - if (Tiles.method2024(WorldMapRegion.getWidgetFlags(var0))) { - for (var16 = 2; var16 >= 0; --var16) { - if (var10 != var16) { - AttackOption.addWidgetItemMenuItem(var0, var8, var13, var16, false); - } - } - - if (var10 >= 0) { - AttackOption.addWidgetItemMenuItem(var0, var8, var13, var10, true); - } - } - - var9 = var0.itemActions; - if (var9 != null) { - for (var16 = 4; var16 >= 0; --var16) { - if (var9[var16] != null) { - byte var12 = 0; - if (var16 == 0) { - var12 = 39; - } - - if (var16 == 1) { - var12 = 40; - } - - if (var16 == 2) { - var12 = 41; - } - - if (var16 == 3) { - var12 = 42; - } - - if (var16 == 4) { - var12 = 43; - } - - GameBuild.insertMenuItemNoShift(var9[var16], FloorUnderlayDefinition.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); - } - } - } - - GameBuild.insertMenuItemNoShift("Examine", FloorUnderlayDefinition.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); - } - } - } - - ++var13; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (ClanChannel.method2748(WorldMapRegion.getWidgetFlags(var0)) && (ObjectComposition.selectedSpellFlags & 32) == 32) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var13 = 9; var13 >= 5; --var13) { - String var14 = GrandExchangeOfferWorldComparator.method5385(var0, var13); - if (var14 != null) { - GameBuild.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); - } - } - - var3 = GameEngine.Widget_getSpellActionName(var0); - if (var3 != null) { - GameBuild.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - String var5 = GrandExchangeOfferWorldComparator.method5385(var0, var4); - if (var5 != null) { - StructComposition.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); - } - } - - if (class18.method271(WorldMapRegion.getWidgetFlags(var0))) { - GameBuild.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-644936535" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (class264.friendsChat != null) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2713, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static String method785(Widget var0, int var1) { + int var3 = PendingSpawn.getWidgetFlags(var0); // L: 11905 + boolean var2 = (var3 >> var1 + 1 & 1) != 0; // L: 11907 + if (!var2 && var0.onOp == null) { // L: 11909 + return null; + } else { + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; // L: 11910 11911 11913 } } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 13d5afaf8b..c07cc1b4c2 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -7,258 +7,227 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fh") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("ss") + @ObfuscatedGetter( + intValue = 1292263875 + ) + static int field1761; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("SpotAnimationDefinition_archive") - static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("q") + public static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("SpotAnimationDefinition_cached") static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("SpotAnimationDefinition_cachedModels") static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1100100919 + intValue = -2092405137 ) @Export("id") int id; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -738164853 + intValue = 913574013 ) @Export("archive") int archive; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1853945339 + intValue = 1089324125 ) @Export("sequence") public int sequence; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -123212011 + intValue = 1411126425 ) @Export("widthScale") int widthScale; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1193470623 + intValue = -1449901039 ) @Export("heightScale") int heightScale; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 909503517 + intValue = 1987144689 ) @Export("orientation") int orientation; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2019294905 + intValue = -1401289239 ) @Export("ambient") int ambient; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 194112589 + intValue = -1433437807 ) @Export("contrast") int contrast; static { - SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); + SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 15 } SpotAnimationDefinition() { - this.sequence = -1; - this.widthScale = 128; - this.heightScale = 128; - this.orientation = 0; - this.ambient = 0; - this.contrast = 0; - } + 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 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-704579839" + descriptor = "(Lop;I)V", + garbageValue = "-140600950" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 44 + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-105831087" + descriptor = "(Lop;II)V", + garbageValue = "2031603320" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 51 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 52 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 53 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 54 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 55 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 56 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 57 this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + if (var2 == 40) { // L: 58 + var3 = var1.readUnsignedByte(); // L: 59 + this.recolorFrom = new short[var3]; // L: 60 + this.recolorTo = new short[var3]; // L: 61 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 62 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 67 + var3 = var1.readUnsignedByte(); // L: 68 + this.retextureFrom = new short[var3]; // L: 69 + this.retextureTo = new short[var3]; // L: 70 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } } } - } + } // L: 77 - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)Lhl;", - garbageValue = "1268722645" + garbageValue = "630621817" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); - if (var2 == null) { - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); - if (var3 == null) { + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 + if (var2 == null) { // L: 81 + ModelData var3 = ModelData.ModelData_get(class389.SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 + if (var3 == null) { // L: 83 return null; } int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 84 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 89 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91 } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95 } Model var5; - if (this.sequence != -1 && var1 != -1) { - var5 = KitDefinition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 98 + var5 = MouseHandler.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); + var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } - if (this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { // L: 100 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { - if (this.orientation == 90) { + if (this.orientation != 0) { // L: 101 + if (this.orientation == 90) { // L: 102 var5.rotateY90Ccw(); } - if (this.orientation == 180) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 180) { // L: 103 + var5.rotateY90Ccw(); // L: 104 + var5.rotateY90Ccw(); // L: 105 } - if (this.orientation == 270) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 270) { // L: 107 + var5.rotateY90Ccw(); // L: 108 + var5.rotateY90Ccw(); // L: 109 + var5.rotateY90Ccw(); // L: 110 } } - return var5; - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "(Lci;III)V", - garbageValue = "-839414713" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = KitDefinition.SequenceDefinition_get(var1).field1961; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1142 = 0; - } - - if (var3 == 2) { - var0.field1142 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || KitDefinition.SequenceDefinition_get(var1).field1955 >= KitDefinition.SequenceDefinition_get(var0.sequence).field1955) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1142 = 0; - var0.field1129 = var0.pathLength; - } - + return var5; // L: 113 } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index c053d47193..6d1dfad9ea 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -7,46 +7,149 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iw") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -825635433 + intValue = 136807485 ) @Export("width") public final int width; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -878139191 + intValue = 1011180321 ) @Export("height") public final int height; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; - this.height = var2; - this.xWidths = var3; - this.xStarts = var4; - } + this.width = var1; // L: 731 + this.height = var2; // L: 732 + this.xWidths = var3; // L: 733 + this.xStarts = var4; // L: 734 + } // L: 735 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "64" + garbageValue = "75" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { - int var3 = this.xStarts[var2]; - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 738 + int var3 = this.xStarts[var2]; // L: 739 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 740 return true; } } - return false; + return false; // L: 742 } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-23" + ) + static String method4998(int var0) { + return ""; // L: 18 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1302166518" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 154 + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "-404139593" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4974 + var2 = 1; + } + + if (var3 < 1) { // L: 4975 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4976 + int var6; + if (var5 < 0) { // L: 4978 + var6 = Client.field464; + } else if (var5 >= 100) { // L: 4979 + var6 = Client.field550; + } else { + var6 = (Client.field550 - Client.field464) * var5 / 100 + Client.field464; // L: 4980 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4981 + int var8; + int var9; + short var15; + if (var7 < Client.field729) { // L: 4982 + var15 = Client.field729; // L: 4983 + var6 = var15 * var2 * 334 / (var3 * 512); // L: 4984 + if (var6 > Client.field600) { // L: 4985 + var6 = Client.field600; // L: 4986 + var8 = var3 * var6 * 512 / (var15 * 334); // L: 4987 + var9 = (var2 - var8) / 2; // L: 4988 + if (var4) { // L: 4989 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4990 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4991 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4992 + } + + var0 += var9; // L: 4994 + var2 -= var9 * 2; // L: 4995 + } + } else if (var7 > Client.field730) { // L: 4998 + var15 = Client.field730; // L: 4999 + var6 = var15 * var2 * 334 / (var3 * 512); // L: 5000 + if (var6 < Client.field727) { // L: 5001 + var6 = Client.field727; // L: 5002 + var8 = var15 * var2 * 334 / (var6 * 512); // L: 5003 + var9 = (var3 - var8) / 2; // L: 5004 + if (var4) { // L: 5005 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 5006 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 5007 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 5008 + } + + var1 += var9; // L: 5010 + var3 -= var9 * 2; // L: 5011 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 5014 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 5015 + int[] var14 = new int[9]; // L: 5017 + + for (var9 = 0; var9 < var14.length; ++var9) { // L: 5018 + int var10 = var9 * 32 + 15 + 128; // L: 5019 + int var11 = var10 * 3 + 600; // L: 5022 + int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 5025 + int var12 = class150.method2971(var11, var3); // L: 5026 + var14[var9] = var12 * var13 >> 16; // L: 5027 + } + + Scene.Scene_buildVisiblityMap(var14, 500, 800, var2 * 334 / var3, 334); // L: 5029 + } + + Client.viewportOffsetX = var0; // L: 5032 + Client.viewportOffsetY = var1; // L: 5033 + Client.viewportWidth = var2; // L: 5034 + Client.viewportHeight = var3; // L: 5035 + } // L: 5036 } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 929231d7b3..82d01d296d 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,899 +3,899 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("on") +@ObfuscatedName("ow") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("pixels") public int[] pixels; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("subWidth") public int subWidth; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("subHeight") public int subHeight; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("xOffset") public int xOffset; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("yOffset") - public int yOffset; - @ObfuscatedName("k") + int yOffset; + @ObfuscatedName("g") @Export("width") public int width; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("height") public int height; public SpritePixels(int[] var1, int var2, int var3) { - this.pixels = var1; - this.subWidth = this.width = var2; - this.subHeight = this.height = var3; - this.yOffset = 0; - this.xOffset = 0; - } + 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 public SpritePixels(int var1, int var2) { - this(new int[var2 * var1], var1, var2); - } + this(new int[var2 * var1], var1, var2); // L: 22 + } // L: 23 - public SpritePixels() { - } + SpritePixels() { + } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lon;" + descriptor = "()Low;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { - 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; + 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 - 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]; + 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 } } - return var1; + return var1; // L: 44 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lon;" + descriptor = "()Low;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { - SpritePixels var1 = new SpritePixels(this.width, this.height); + SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 48 - 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]; + 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 } } - return var1; + return var1; // L: 54 } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("setRaster") public void setRaster() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); - } + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 + } // L: 59 - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { - int[] var1 = new int[this.width * this.height]; + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 + int[] var1 = new int[this.width * this.height]; // L: 63 - for (int var2 = 0; var2 < this.subHeight; ++var2) { - for (int var3 = 0; var3 < this.subWidth; ++var3) { - var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; + for (int var2 = 0; var2 < this.subHeight; ++var2) { // 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 } } - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; + 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 } - } + } // L: 74 - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("pad") public void pad(int var1) { - if (this.subWidth != this.width || this.subHeight != this.height) { - int var2 = var1; - if (var1 > this.xOffset) { + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 + int var2 = var1; // L: 78 + if (var1 > this.xOffset) { // L: 79 var2 = this.xOffset; } - int var3 = var1; - if (var1 + this.xOffset + this.subWidth > this.width) { + int var3 = var1; // L: 80 + if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 var3 = this.width - this.xOffset - this.subWidth; } - int var4 = var1; - if (var1 > this.yOffset) { + int var4 = var1; // L: 82 + if (var1 > this.yOffset) { // L: 83 var4 = this.yOffset; } - int var5 = var1; - if (var1 + this.yOffset + this.subHeight > this.height) { + int var5 = var1; // L: 84 + if (var1 + this.yOffset + this.subHeight > this.height) { // L: 85 var5 = this.height - this.yOffset - this.subHeight; } - int var6 = var2 + var3 + this.subWidth; - int var7 = var4 + var5 + this.subHeight; - int[] var8 = new int[var6 * var7]; + int var6 = var2 + var3 + this.subWidth; // L: 86 + int var7 = var4 + var5 + this.subHeight; // L: 87 + int[] var8 = new int[var6 * var7]; // L: 88 - 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]; + 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 } } - this.pixels = var8; - this.subWidth = var6; - this.subHeight = var7; - this.xOffset -= var2; - this.yOffset -= var4; + 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 } - } + } // L: 99 - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("flipHorizontally") public void flipHorizontally() { - int[] var1 = new int[this.subWidth * this.subHeight]; - int var2 = 0; + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 + int var2 = 0; // L: 103 - for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 104 for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { - var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; + var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 105 } } - this.pixels = var1; - this.xOffset = this.width - this.subWidth - this.xOffset; - } + this.pixels = var1; // L: 107 + this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 + } // L: 109 - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("flipVertically") public void flipVertically() { - int[] var1 = new int[this.subWidth * this.subHeight]; - int var2 = 0; + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 + int var2 = 0; // L: 113 - for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { - for (int var4 = 0; var4 < this.subWidth; ++var4) { + 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; - this.yOffset = this.height - this.subHeight - this.yOffset; - } + this.pixels = var1; // L: 117 + this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 + } // L: 119 - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("outline") public void outline(int var1) { - int[] var2 = new int[this.subWidth * this.subHeight]; - int var3 = 0; + int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 + int var3 = 0; // L: 123 - 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) { + 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 var6 = var1; - } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 var6 = var1; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; - } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { + var6 = var1; // L: 130 + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 var6 = var1; } } - var2[var3++] = var6; + var2[var3++] = var6; // L: 133 } } - this.pixels = var2; - } + this.pixels = var2; // L: 136 + } // L: 137 - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("shadow") public void shadow(int var1) { - for (int var2 = this.subHeight - 1; var2 > 0; --var2) { - int var3 = var2 * this.subWidth; + for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 + int var3 = var2 * this.subWidth; // L: 141 - for (int var4 = this.subWidth - 1; var4 > 0; --var4) { + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; + this.pixels[var4 + var3] = var1; // L: 143 } } } - } + } // L: 146 - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + 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 int var9; - 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 (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 (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 164 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (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 (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= 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 > 0 && var5 > 0) { - Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 180 + Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); // L: 181 } - } + } // L: 182 - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + 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 int var9; - 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 (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 (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 218 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (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 (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= 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 > 0 && var5 > 0) { - Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 234 + Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); // L: 235 } - } + } // L: 236 - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { - if (var3 > 0 && var4 > 0) { - int var5 = this.subWidth; - int var6 = this.subHeight; - int var7 = 0; - int var8 = 0; - int var9 = this.width; - int var10 = this.height; - int var11 = (var9 << 16) / var3; - int var12 = (var10 << 16) / var4; + 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 int var13; - if (this.xOffset > 0) { - var13 = (var11 + (this.xOffset << 16) - 1) / var11; - var1 += var13; - var7 += var13 * var11 - (this.xOffset << 16); + 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.yOffset > 0) { - var13 = (var12 + (this.yOffset << 16) - 1) / var12; - var2 += var13; - var8 += var13 * var12 - (this.yOffset << 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 (var5 < var9) { + if (var5 < var9) { // L: 286 var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { + if (var6 < var10) { // L: 287 var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 288 + int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 289 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 290 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var15; - var13 += var15 * Rasterizer2D.Rasterizer2D_width; - var8 += var12 * 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var15; - var14 += 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var15; - var13 += var15; - var7 += var11 * 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 } - Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); + Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 309 } - } + } // L: 310 - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { - if (var3 == 256) { - this.drawTransBgAt(var1, var2); + if (var3 == 256) { // L: 329 + this.drawTransBgAt(var1, var2); // L: 330 } else { - var1 += this.xOffset; - var2 += this.yOffset; - int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var6 = 0; - int var7 = this.subHeight; - int var8 = this.subWidth; - int var9 = Rasterizer2D.Rasterizer2D_width - var8; - int var10 = 0; + 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 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var7 -= var11; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var6 += var11 * var8; - var5 += var11 * Rasterizer2D.Rasterizer2D_width; + if (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 (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 348 var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (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 (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var8 -= 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 > 0 && var7 > 0) { - Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); + 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 } } - } - - @ObfuscatedName("x") - @Export("drawTransAt") - public void drawTransAt(int var1, int var2, int var3) { - var1 += this.xOffset; - var2 += this.yOffset; - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var5 = 0; - int var6 = this.subHeight; - int var7 = this.subWidth; - int var8 = Rasterizer2D.Rasterizer2D_width - var7; - int var9 = 0; - int var10; - if (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) { - var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; - } - - 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) { - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var7 -= var10; - var9 += var10; - var8 += var10; - } - - if (var7 > 0 && var6 > 0) { - Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); - } - } + } // L: 331 366 @ObfuscatedName("z") - @Export("drawTransScaledAt") - public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { - int var6 = this.subWidth; - int var7 = this.subHeight; - int var8 = 0; - int var9 = 0; - int var10 = this.width; - int var11 = this.height; - int var12 = (var10 << 16) / var3; - int var13 = (var11 << 16) / var4; - int var14; - if (this.xOffset > 0) { - var14 = (var12 + (this.xOffset << 16) - 1) / var12; - var1 += var14; - var8 += var14 * var12 - (this.xOffset << 16); - } - - if (this.yOffset > 0) { - var14 = (var13 + (this.yOffset << 16) - 1) / var13; - var2 += var14; - var9 += var14 * var13 - (this.yOffset << 16); - } - - if (var6 < var10) { - var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; - } - - if (var7 < var11) { - var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; - } - - 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) { - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var16; - var14 += var16 * Rasterizer2D.Rasterizer2D_width; - var9 += var13 * var16; - } - - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var16; - var15 += var16; - } - - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var16; - var14 += var16; - var8 += var12 * var16; - var15 += var16; - } - - Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); - } - } - - @ObfuscatedName("o") - public void method7391(int var1, int var2, int var3) { - var1 += this.xOffset; - var2 += this.yOffset; - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var5 = 0; - int var6 = this.subHeight; - int var7 = this.subWidth; - int var8 = Rasterizer2D.Rasterizer2D_width - var7; - int var9 = 0; + @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 int var10; - 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 (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 (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 404 var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (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 (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var7 -= 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 > 0 && var6 > 0) { - if (var3 == 256) { - method7409(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); - } else { - method7381(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); - } - + if (var7 > 0 && var6 > 0) { // L: 420 + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); // L: 421 } - } + } // L: 422 - @ObfuscatedName("u") - public void method7339(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { - int var6 = this.subWidth; - int var7 = this.subHeight; - int var8 = 0; - int var9 = 0; - int var10 = this.width; - int var11 = this.height; - int var12 = (var10 << 16) / var3; - int var13 = (var11 << 16) / var4; + @ObfuscatedName("d") + @Export("drawTransScaledAt") + public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { // L: 441 + int var6 = this.subWidth; // L: 442 + 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 int var14; - if (this.xOffset > 0) { - var14 = (var12 + (this.xOffset << 16) - 1) / var12; - var1 += var14; - var8 += var14 * var12 - (this.xOffset << 16); + 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.yOffset > 0) { - var14 = (var13 + (this.yOffset << 16) - 1) / var13; - var2 += var14; - var9 += var14 * var13 - (this.yOffset << 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 (var6 < var10) { + if (var6 < var10) { // L: 460 var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { + if (var7 < var11) { // L: 461 var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var15 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 462 + int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 463 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 464 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var16; - var14 += var16 * Rasterizer2D.Rasterizer2D_width; - var9 += var13 * 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var16; - var15 += 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var16; - var14 += var16; - var8 += var12 * 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 (var5 == 256) { - method7316(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); // L: 483 + } + } // L: 484 + + @ObfuscatedName("m") + public void method7425(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 + 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 (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 522 + 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 (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 > 0 && var6 > 0) { // L: 538 + if (var3 == 256) { + method7405(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method7317(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method7431(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } - } + } // L: 541 - @ObfuscatedName("ad") - public void method7318(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { - int var9 = var2 < 0 ? -var2 : 0; - int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; - int var11 = var1 < 0 ? -var1 : 0; + @ObfuscatedName("h") + public void method7407(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 + 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.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 (var6 < var10) { // L: 601 + var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; + } + + if (var7 < var11) { // L: 602 + 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 + 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 612 + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 613 + var3 -= var16; // L: 614 + var15 += var16; // L: 615 + } + + 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 (var5 == 256) { // L: 624 + method7408(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + } else { + method7409(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + } + + } + } // L: 626 + + @ObfuscatedName("ae") + public void method7410(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 var10000; - if (this.subWidth + var1 <= var5) { + if (this.subWidth + var1 <= var5) { // L: 678 var10000 = this.subWidth; } else { var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; - int var14 = var9 + var2; + int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; // L: 679 + int var14 = var9 + var2; // L: 680 - for (int var15 = var9; var15 < var10; ++var15) { - int var16 = var7[var14]; - int var17 = var8[var14++]; - int var18 = var13; + 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 int var19; - if (var1 < var16) { - var19 = var16 - var1; - var18 = var13 + (var19 - var11); + if (var1 < var16) { // L: 686 + var19 = var16 - var1; // L: 687 + var18 = var13 + (var19 - var11); // L: 688 } else { - var19 = var11; + var19 = var11; // L: 690 } int var12; - if (this.subWidth + var1 <= var16 + var17) { + if (this.subWidth + var1 <= var16 + var17) { // L: 691 var12 = this.subWidth; } else { - var12 = var16 + var17 - var1; + var12 = var16 + var17 - var1; // L: 692 } - for (int var20 = var19; var20 < var12; ++var20) { - int var21 = this.pixels[var20 + var15 * this.subWidth]; + for (int var20 = var19; var20 < var12; ++var20) { // L: 693 + int var21 = this.pixels[var20 + var15 * this.subWidth]; // L: 694 if (var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; + Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 695 } else { - ++var18; + ++var18; // L: 696 } } - var13 += Rasterizer2D.Rasterizer2D_width; + var13 += Rasterizer2D.Rasterizer2D_width; // L: 698 } - } + } // L: 700 - @ObfuscatedName("as") + @ObfuscatedName("aq") @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; - 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; + 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 - 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 (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 (var1 = -var10[var2]; var1 < 0; ++var1) { - Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; - var20 += var14; - var21 -= var13; + 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 } - var15 += var13; - var16 += var14; - var17 += Rasterizer2D.Rasterizer2D_width; + var15 += var13; // L: 723 + var16 += var14; // L: 724 + var17 += Rasterizer2D.Rasterizer2D_width; // L: 725 } - } catch (Exception var23) { + } catch (Exception var23) { // L: 728 } - } + } // L: 729 - @ObfuscatedName("ak") - public void method7320(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("al") + public void method7384(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { - int var10 = -var3 / 2; - int var11 = -var4 / 2; - 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; + 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 - for (var2 = 0; var2 < var4; ++var2) { - int var17 = var16; - int var18 = var14; - int var19 = var15; + for (var2 = 0; var2 < var4; ++var2) { // L: 742 + int var17 = var16; // L: 743 + int var18 = var14; // L: 744 + int var19 = var15; // L: 745 - for (var1 = -var3; var1 < 0; ++var1) { - int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; - if (var20 != 0) { + 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 Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { - ++var17; + ++var17; // L: 749 } - var18 += var13; - var19 -= var12; + var18 += var13; // L: 750 + var19 -= var12; // L: 751 } - var14 += var12; - var15 += var13; - var16 += Rasterizer2D.Rasterizer2D_width; + var14 += var12; // L: 753 + var15 += var13; // L: 754 + var16 += Rasterizer2D.Rasterizer2D_width; // L: 755 } - } catch (Exception var22) { + } catch (Exception var22) { // L: 758 } - } + } // L: 759 - @ObfuscatedName("ah") - public void method7350(int var1, int var2, int var3, int var4) { - this.method7321(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); - } + @ObfuscatedName("am") + public void method7445(int var1, int var2, int var3, int var4) { + this.method7414(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + } // L: 763 - @ObfuscatedName("ay") - void method7321(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var6 != 0) { - var1 -= this.xOffset << 4; - var2 -= this.yOffset << 4; - double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; - int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); - int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); - int var11 = var10 * -var1 + -var2 * var9; - int var12 = -var2 * var10 + var9 * -(-var1); - int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; - int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; - int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; - int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); - int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); - int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); + @ObfuscatedName("ai") + void method7414(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 int var19; int var20; - if (var11 < var13) { - var19 = var11; - var20 = var13; + if (var11 < var13) { // L: 782 + var19 = var11; // L: 783 + var20 = var13; // L: 784 } else { - var19 = var13; - var20 = var11; + var19 = var13; // L: 787 + var20 = var11; // L: 788 } - if (var15 < var19) { + if (var15 < var19) { // L: 790 var19 = var15; } - if (var17 < var19) { + if (var17 < var19) { // L: 791 var19 = var17; } - if (var15 > var20) { + if (var15 > var20) { // L: 792 var20 = var15; } - if (var17 > var20) { + if (var17 > var20) { // L: 793 var20 = var17; } int var21; int var22; - if (var12 < var14) { - var21 = var12; - var22 = var14; + if (var12 < var14) { // L: 796 + var21 = var12; // L: 797 + var22 = var14; // L: 798 } else { - var21 = var14; - var22 = var12; + var21 = var14; // L: 801 + var22 = var12; // L: 802 } - if (var16 < var21) { + if (var16 < var21) { // L: 804 var21 = var16; } - if (var18 < var21) { + if (var18 < var21) { // L: 805 var21 = var18; } - if (var16 > var22) { + if (var16 > var22) { // L: 806 var22 = var16; } - if (var18 > var22) { + if (var18 > var22) { // L: 807 var22 = var18; } - var19 >>= 12; - var20 = var20 + 4095 >> 12; - var21 >>= 12; - var22 = var22 + 4095 >> 12; - var19 += var3; - var20 += var3; - var21 += var4; - var22 += var4; - var19 >>= 4; - var20 = var20 + 15 >> 4; - var21 >>= 4; - var22 = var22 + 15 >> 4; - if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { + var19 >>= 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 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 821 var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 822 var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 823 var22 = Rasterizer2D.Rasterizer2D_yClipEnd; } - var20 = var19 - var20; - if (var20 < 0) { - var22 = var21 - var22; - if (var22 < 0) { - int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; - double var24 = 1.6777216E7D / (double)var6; - int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); - int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); - int var28 = (var19 << 4) + 8 - var3; - int var29 = (var21 << 4) + 8 - var4; - int var30 = (var1 << 8) - (var29 * var26 >> 4); - int var31 = (var29 * var27 >> 4) + (var2 << 8); + 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 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) { - if (var26 == 0) { + if (var27 == 0) { // L: 837 + if (var26 == 0) { // L: 838 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = var31; - var37 = var20; - if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { - for (; var37 < 0; ++var37) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + 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 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 851 } } } - ++var33; + ++var33; // L: 839 } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 855 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 869 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 871 + if (var38 != 0) { // L: 872 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 873 } - var36 += var26; - ++var37; + var36 += var26; // L: 874 + ++var37; // L: 870 } } - ++var33; + ++var33; // L: 856 var30 -= var26; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 892 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 894 + if (var38 != 0) { // L: 895 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 896 } - var36 += var26; - ++var37; + var36 += var26; // L: 897 + ++var37; // L: 893 } } - ++var33; + ++var33; // L: 879 var30 -= var26; } } - } else if (var27 < 0) { - if (var26 == 0) { + } else if (var27 < 0) { // L: 902 + if (var26 == 0) { // L: 903 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 917 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 919 + if (var38 != 0) { // L: 920 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 921 } - var35 += var27; - ++var37; + var35 += var27; // L: 922 + ++var37; // L: 918 } } - ++var33; + ++var33; // L: 904 var31 += var27; } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 926 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 939 var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if ((var32 = var36 - (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 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 947 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 949 + if (var38 != 0) { // L: 950 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 951 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 952 + var36 += var26; // L: 953 + ++var37; // L: 948 } - ++var33; + ++var33; // L: 927 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 970 var37 = var32; } - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += 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 ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 978 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 980 + if (var38 != 0) { // L: 981 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 982 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 983 + var36 += var26; // L: 984 + ++var37; // L: 979 } - ++var33; + ++var33; // L: 958 var30 -= var26; var31 += var27; } } - } else if (var26 == 0) { + } else if (var26 == 0) { // L: 990 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1004 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1006 + if (var38 != 0) { // L: 1007 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1008 } - var35 += var27; - ++var37; + var35 += var27; // L: 1009 + ++var37; // L: 1005 } } - ++var33; + ++var33; // L: 991 var31 += var27; } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 1013 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1026 var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if ((var32 = var36 - (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 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 1034 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1036 + if (var38 != 0) { // L: 1037 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1038 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 1039 + var36 += var26; // L: 1040 + ++var37; // L: 1035 } - ++var33; + ++var33; // L: 1014 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + 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 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1057 var37 = var32; } - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += 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 ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1065 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1067 + if (var38 != 0) { // L: 1068 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1069 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 1070 + var36 += var26; // L: 1071 + ++var37; // L: 1066 } - ++var33; + ++var33; // L: 1045 var30 -= var26; var31 += var27; } @@ -1255,405 +1255,405 @@ public final class SpritePixels extends Rasterizer2D { } } } - } + } // L: 1076 - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { - if (var3 <= this.width && var4 <= this.height) { - int var5 = var3 * this.xOffset / this.width + var1; - int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; - int var7 = var2 + var4 * this.yOffset / this.height; - int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; - if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { + 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 var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1087 var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1088 var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1089 var8 = Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var5 < var6 && var7 < var8) { - int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; - int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); - if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { - for (int var11 = var7; var11 < var8; ++var11) { - for (int var12 = var5; var12 < var6; ++var12) { - int var13 = var12 - var1 << 4; - int var14 = var11 - var2 << 4; - int var15 = var13 * this.width / var3 - (this.xOffset << 4); - int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); - int var17 = var14 * this.height / var4 - (this.yOffset << 4); - int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); - int var19 = (var16 - var15) * (var18 - var17) >> 1; - if (var19 != 0) { - if (var15 < 0) { + 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 var15 = 0; } - if (var16 >= this.subWidth << 4) { + if (var16 >= this.subWidth << 4) { // L: 1107 var16 = this.subWidth << 4; } - if (var17 < 0) { + if (var17 < 0) { // L: 1108 var17 = 0; } - if (var18 >= this.subHeight << 4) { + if (var18 >= this.subHeight << 4) { // L: 1109 var18 = this.subHeight << 4; } - --var16; - --var18; - int var20 = 16 - (var15 & 15); - int var21 = (var16 & 15) + 1; - int var22 = 16 - (var17 & 15); - int var23 = (var18 & 15) + 1; - var15 >>= 4; - var16 >>= 4; - var17 >>= 4; - var18 >>= 4; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; + --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 int var28; - for (var28 = var17; var28 <= var18; ++var28) { - int var29 = 16; - if (var28 == var17) { + for (var28 = var17; var28 <= var18; ++var28) { // L: 1124 + int var29 = 16; // L: 1125 + if (var28 == var17) { // L: 1126 var29 = var22; } - if (var28 == var18) { + if (var28 == var18) { // L: 1127 var29 = var23; } - for (int var30 = var15; var30 <= var16; ++var30) { - int var31 = this.pixels[var30 + var28 * this.subWidth]; - if (var31 != 0) { + for (int var30 = var15; var30 <= var16; ++var30) { // L: 1128 + int var31 = this.pixels[var30 + var28 * this.subWidth]; // L: 1129 + if (var31 != 0) { // L: 1130 int var32; - if (var30 == var15) { + if (var30 == var15) { // L: 1132 var32 = var29 * var20; - } else if (var30 == var16) { + } else if (var30 == var16) { // L: 1133 var32 = var29 * var21; } else { - var32 = var29 << 4; + var32 = var29 << 4; // L: 1134 } - var27 += var32; - var24 += var32 * (var31 >> 16 & 255); - var25 += var32 * (var31 >> 8 & 255); - var26 += (var31 & 255) * var32; + var27 += var32; // L: 1135 + var24 += var32 * (var31 >> 16 & 255); // L: 1136 + var25 += var32 * (var31 >> 8 & 255); // L: 1137 + var26 += (var31 & 255) * var32; // L: 1138 } } } - if (var27 >= var19) { - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); - if (var28 == 0) { + if (var27 >= var19) { // L: 1142 + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1143 + if (var28 == 0) { // L: 1144 var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1145 } - ++var9; + ++var9; // L: 1147 } } - var9 += var10; + var9 += var10; // L: 1149 } } } } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 1080 } - } + } // L: 1094 1151 - @ObfuscatedName("y") + @ObfuscatedName("x") @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) { + for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 int var9; - for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { - var0[var3++] = var1[var2++]; - var0[var3++] = var1[var2++]; - var0[var3++] = var1[var2++]; + for (var9 = 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 += 3; var3 < var9; var0[var3++] = var1[var2++]) { + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 } - var3 += var6; - var2 += var7; + var3 += var6; // L: 197 + var2 += var7; // L: 198 } - } + } // L: 200 - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 239 + var5 = -(var5 & 3); // L: 240 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 int var11; - for (var11 = var9; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { + for (var11 = var9; var11 < 0; ++var11) { // L: 242 + var2 = var1[var3++]; // L: 243 + if (var2 != 0) { // L: 244 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 245 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 246 + if (var2 != 0) { // L: 247 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 248 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 249 + if (var2 != 0) { // L: 250 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 251 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 252 + if (var2 != 0) { // L: 253 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 254 } } - for (var11 = var5; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 256 + var2 = var1[var3++]; // L: 257 + if (var2 != 0) { // L: 258 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 259 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 261 + var3 += var8; // L: 262 } - } + } // L: 264 - @ObfuscatedName("s") + @ObfuscatedName("l") @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; + int var12 = var3; // L: 313 - for (int var13 = -var8; var13 < 0; ++var13) { - int var14 = var11 * (var4 >> 16); + for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 + int var14 = var11 * (var4 >> 16); // L: 315 - for (int var15 = -var7; var15 < 0; ++var15) { - var2 = var1[(var3 >> 16) + var14]; - if (var2 != 0) { + for (int var15 = -var7; var15 < 0; ++var15) { // L: 316 + var2 = var1[(var3 >> 16) + var14]; // L: 317 + if (var2 != 0) { // L: 318 var0[var5++] = var2; } else { - ++var5; + ++var5; // L: 319 } - var3 += var9; + var3 += var9; // L: 320 } - var4 += var10; - var3 = var12; - var5 += var6; + var4 += var10; // L: 322 + var3 = var12; // L: 323 + var5 += var6; // L: 324 } - } - - @ObfuscatedName("b") - @Export("Sprite_drawTransOverlay") - static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - int var11 = 256 - var9; - int var12 = (var10 & 16711935) * var11 & -16711936; - int var13 = (var10 & 65280) * var11 & 16711680; - var10 = (var12 | var13) >>> 8; - - for (int var14 = -var6; var14 < 0; ++var14) { - for (int var15 = -var5; var15 < 0; ++var15) { - var2 = var1[var3++]; - if (var2 != 0) { - var12 = var9 * (var2 & 16711935) & -16711936; - var13 = (var2 & 65280) * var9 & 16711680; - var0[var4++] = var10 + ((var12 | var13) >>> 8); - } else { - ++var4; - } - } - - var4 += var7; - var3 += var8; - } - - } - - @ObfuscatedName("p") - @Export("Sprite_drawTransparent") - static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - int var10 = 256 - var9; - - for (int var11 = -var6; var11 < 0; ++var11) { - for (int var12 = -var5; var12 < 0; ++var12) { - var2 = var1[var3++]; - if (var2 != 0) { - int var13 = var0[var4]; - var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; - } else { - ++var4; - } - } - - var4 += var7; - var3 += var8; - } - - } - - @ObfuscatedName("h") - @Export("Sprite_drawTransScaled") - static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - int var13 = 256 - var12; - int var14 = var3; - - for (int var15 = -var8; var15 < 0; ++var15) { - int var16 = var11 * (var4 >> 16); - - for (int var17 = -var7; var17 < 0; ++var17) { - var2 = var1[(var3 >> 16) + var16]; - if (var2 != 0) { - int var18 = var0[var5]; - var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; - } else { - ++var5; - } - - var3 += var9; - } - - var4 += var10; - var3 = var14; - var5 += var6; - } - - } - - @ObfuscatedName("r") - static void method7409(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - for (var8 = -var10; var8 < 0; ++var8) { - for (var6 = -var9; var6 < 0; ++var6) { - var0 = var4[var5++]; - 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; - } - } - - var7 += var11; - var5 += var12; - } - - } + } // L: 326 @ObfuscatedName("n") - static void method7381(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { - for (var8 = -var10; var8 < 0; ++var8) { - for (var6 = -var9; var6 < 0; ++var6) { - var0 = var4[var5++]; - if (var0 != 0) { - var1 = var13 * (var0 & 16711935); - var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; - var1 = var3[var7]; - var2 = var0 + var1; - var0 = (var0 & 16711935) + (var1 & 16711935); - var1 = (var0 & 16777472) + (var2 - var0 & 65536); - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + @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 + + 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 } else { - ++var7; + ++var4; // L: 381 } } - var7 += var11; - var5 += var12; + var4 += var7; // L: 383 + var3 += var8; // L: 384 } - } + } // L: 386 - @ObfuscatedName("d") - static void method7316(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - for (int var16 = var3; var8 < 0; ++var8) { - var7 = var15 * (var9 >> 16); + @ObfuscatedName("q") + @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 - 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); + 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 } else { - ++var10; + ++var4; // L: 433 } - - var3 += var13; } - var9 += var14; - var3 = var16; - var10 += var11; + var4 += var7; // L: 435 + var3 += var8; // L: 436 } - } + } // L: 438 - @ObfuscatedName("ab") - static void method7317(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { - for (int var17 = var3; var8 < 0; ++var8) { - var7 = var15 * (var9 >> 16); + @ObfuscatedName("r") + @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 - 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); + for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 + int var16 = var11 * (var4 >> 16); // L: 490 + + 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 } else { - ++var10; + ++var5; // L: 497 } - var3 += var13; + var3 += var9; // L: 498 } - var9 += var14; - var3 = var17; - var10 += var11; + var4 += var10; // L: 500 + var3 = var14; // L: 501 + var5 += var6; // L: 502 } - } + } // L: 504 + + @ObfuscatedName("c") + static void method7405(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 + } else { + ++var7; // L: 554 + } + } + + var7 += var11; // L: 556 + var5 += var12; // L: 557 + } + + } // L: 559 + + @ObfuscatedName("f") + static void method7431(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 + } else { + ++var7; // L: 574 + } + } + + var7 += var11; // L: 576 + var5 += var12; // L: 577 + } + + } // L: 579 + + @ObfuscatedName("v") + static void method7408(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 (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 + } else { + ++var10; // L: 641 + } + + var3 += var13; // L: 642 + } + + var9 += var14; // L: 644 + var3 = var16; // L: 645 + var10 += var11; // L: 646 + } + + } // L: 648 + + @ObfuscatedName("ag") + static void method7409(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 (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 + } else { + ++var10; // L: 665 + } + + var3 += var13; // L: 666 + } + + var9 += var14; // L: 668 + var3 = var17; // L: 669 + var10 += var11; // L: 670 + } + + } // L: 672 } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 635a1b221d..8295f9548b 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("jr") @Implements("Strings") public class Strings { - @ObfuscatedName("bf") - public static String field3540; - @ObfuscatedName("cv") - public static String field3539; - @ObfuscatedName("jw") - public static String field3604; - @ObfuscatedName("jj") - public static String field3351; - @ObfuscatedName("js") - public static String field3606; + @ObfuscatedName("bd") + public static String field3501; + @ObfuscatedName("cu") + public static String field3446; + @ObfuscatedName("jo") + public static String field3595; + @ObfuscatedName("jq") + public static String field3634; + @ObfuscatedName("ja") + public static String field3597; static { - field3540 = "Please visit the support page for assistance."; - field3539 = "Please visit the support page for assistance."; - field3604 = ""; - field3351 = "Page has opened in a new window."; - field3606 = "(Please check your popup blocker.)"; - } + field3501 = "Please visit the support page for assistance."; // L: 60 + field3446 = "Please visit the support page for assistance."; // L: 99 + field3595 = ""; // L: 284 + field3634 = "Page has opened in a new window."; // L: 285 + field3597 = "(Please check your popup blocker.)"; // L: 286 + } // L: 324 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1995982953" + ) + static void method5220() { + Messages.Messages_channels.clear(); // L: 54 + Messages.Messages_hashTable.clear(); // L: 55 + Messages.Messages_queue.clear(); // L: 56 + Messages.Messages_count = 0; // L: 57 + } // L: 58 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index b297190ab3..af7320fc82 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,189 +3,91 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("ft") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lko;" + ) + @Export("StructDefinition_archive") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lig;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("f") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("params") IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); + StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 } StructComposition() { - } + } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "793806962" + descriptor = "(B)V", + garbageValue = "-61" ) @Export("postDecode") void postDecode() { - } + } // L: 33 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "101" + descriptor = "(Lop;B)V", + garbageValue = "0" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 37 + if (var2 == 0) { // L: 38 + return; // L: 41 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 39 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-16711936" + descriptor = "(Lop;IB)V", + garbageValue = "15" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = KeyHandler.readStringIntParameters(var1, this.params); + this.params = class13.readStringIntParameters(var1, this.params); // L: 44 } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-24" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "975394033" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lkl;II)Loz;", - garbageValue = "1981380909" - ) - public static IndexedSprite method3153(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); - boolean var2; - if (var3 == null) { - var2 = false; - } else { - class398.SpriteBuffer_decode(var3); - var2 = true; - } - - if (!var2) { - return null; - } else { - IndexedSprite var4 = new IndexedSprite(); - var4.width = class414.SpriteBuffer_spriteWidth; - var4.height = class408.SpriteBuffer_spriteHeight; - var4.xOffset = class135.SpriteBuffer_xOffsets[0]; - var4.yOffset = class131.SpriteBuffer_yOffsets[0]; - var4.subWidth = class414.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class16.SpriteBuffer_spriteHeights[0]; - var4.palette = class351.SpriteBuffer_spritePalette; - var4.pixels = class414.SpriteBuffer_pixels[0]; - StudioGame.method5130(); - return var4; - } - } + } // L: 46 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(CIB)Ljava/lang/String;", - garbageValue = "16" + descriptor = "(III)I", + garbageValue = "-1033236073" ) - public static String method3152(char var0, int var1) { - char[] var2 = new char[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var2[var3] = var0; - } - - return new String(var2); + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + return NPC.method2251(this.params, var1, var2); // L: 49 } - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)I", + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", garbageValue = "0" ) - static final int method3151() { - return ViewportMouse.ViewportMouse_y; - } - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "14" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuShiftClick[Client.menuOptionsCount] = var6; - ++Client.menuOptionsCount; - } - - } + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return VarbitComposition.method3205(this.params, var1, var2); // L: 53 } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index f232ef2c2a..79a7128368 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,113 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("jd") @Implements("StudioGame") public enum StudioGame implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljd;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lot;" + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = 1344605477 ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("t") + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("e") @Export("name") public final String name; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1358867387 + intValue = -866380781 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; - this.id = var5; - } + this.name = var3; // L: 21 + this.id = var5; // L: 22 + } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-183027792" - ) - public static void method5130() { - class135.SpriteBuffer_xOffsets = null; - class131.SpriteBuffer_yOffsets = null; - class414.SpriteBuffer_spriteWidths = null; - class16.SpriteBuffer_spriteHeights = null; - class351.SpriteBuffer_spritePalette = null; - class414.SpriteBuffer_pixels = null; - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(IIIILon;Liw;B)V", - garbageValue = "-74" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method7318(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); - } - - } - } + return this.id; // L: 26 } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 69669e365b..34cf507902 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("ev") @Implements("Task") public class Task { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lev;" ) @Export("next") Task next; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("status") public volatile int status; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 538482785 + intValue = 1160823875 ) @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("intArgument") public int intArgument; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("result") public volatile Object result; Task() { - this.status = 0; - } + this.status = 0; // L: 11 + } // L: 23 } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 15ec509729..5c21b43758 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -10,74 +10,71 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ew") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("q") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lev;" ) @Export("current") Task current; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lev;" ) @Export("task") Task task; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("thread") Thread thread; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; public TaskHandler() { - this.current = null; - this.task = null; - this.isClosed = false; - javaVendor = "Unknown"; - javaVersion = "1.6"; + this.current = null; // L: 11 + this.task = null; // L: 12 + this.isClosed = false; // L: 14 + javaVendor = "Unknown"; // L: 20 + GrandExchangeOfferAgeComparator.javaVersion = "1.6"; // L: 21 try { - javaVendor = System.getProperty("java.vendor"); - javaVersion = System.getProperty("java.version"); - } catch (Exception var2) { + javaVendor = System.getProperty("java.vendor"); // L: 23 + GrandExchangeOfferAgeComparator.javaVersion = System.getProperty("java.version"); // L: 24 + } catch (Exception var2) { // L: 26 } - this.isClosed = false; - this.thread = new Thread(this); - this.thread.setPriority(10); - this.thread.setDaemon(true); - this.thread.start(); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2080769600" + garbageValue = "-1038367564" ) @Export("close") public final void close() { - synchronized(this) { - this.isClosed = true; - this.notifyAll(); - } + synchronized(this) { // L: 35 + this.isClosed = true; // L: 36 + this.notifyAll(); // L: 37 + } // L: 38 try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 40 + } catch (InterruptedException var3) { // L: 42 } - } + } // L: 43 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;S)Lep;", - garbageValue = "3207" + descriptor = "(IIILjava/lang/Object;I)Lev;", + garbageValue = "-1716880810" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -94,24 +91,24 @@ public class TaskHandler implements Runnable { } this.notify(); - return var5; + return var5; // L: 104 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lep;", - garbageValue = "-1536302643" + descriptor = "(Ljava/lang/String;II)Lev;", + garbageValue = "-137947903" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lep;", - garbageValue = "1508388325" + descriptor = "(Ljava/lang/Runnable;II)Lev;", + garbageValue = "-1680555194" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -121,274 +118,161 @@ public class TaskHandler implements Runnable { public final void run() { while (true) { Task var1; - synchronized(this) { + synchronized(this) { // L: 48 while (true) { - if (this.isClosed) { + if (this.isClosed) { // L: 50 return; } - if (this.current != null) { - var1 = this.current; - this.current = this.current.next; - if (this.current == null) { + if (this.current != null) { // L: 51 + var1 = this.current; // L: 52 + this.current = this.current.next; // L: 53 + if (this.current == null) { // L: 54 this.task = null; } break; } try { - this.wait(); - } catch (InterruptedException var8) { + this.wait(); // L: 58 + } catch (InterruptedException var8) { // L: 60 } } } try { - 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) { + 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()); } - var1.status = 1; - } catch (ThreadDeath var6) { - throw var6; - } catch (Throwable var7) { + var1.status = 1; // L: 78 + } catch (ThreadDeath var6) { // L: 80 + throw var6; // L: 81 + } catch (Throwable var7) { // L: 83 var1.status = 2; } } } - @ObfuscatedName("it") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-117" + descriptor = "(II)Lff;", + garbageValue = "-1590739193" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - GameBuild.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84 + if (var1 != null) { // L: 85 + return var1; + } else { + byte[] var2 = DirectByteArrayCopier.ItemDefinition_archive.takeFile(10, var0); // L: 86 + var1 = new ItemComposition(); // L: 87 + var1.id = var0; // L: 88 + if (var2 != null) { // L: 89 + var1.decode(new Buffer(var2)); + } - long var4 = -1L; - long var6 = -1L; + var1.post(); // L: 90 + if (var1.noteTemplate != -1) { // L: 91 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } - int var8; - for (var8 = 0; var8 < BuddyRankComparator.method2458(); ++var8) { - long var24 = WorldMapSection1.method3912(var8); - if (var24 != var6) { - var6 = var24; - int var11 = UserComparator1.method7162(var8); - int var12 = ItemComposition.method3327(ViewportMouse.ViewportMouse_entityTags[var8]); - int var13 = var12; - long var16 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var15 = (int)(var16 >>> 14 & 3L); - int var26 = InterfaceParent.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var17 = var26; - if (var15 == 2 && PlayerComposition.scene.getObjectFlags(VertexNormal.Client_plane, var11, var12, var24) >= 0) { - ObjectComposition var18 = class245.getObjectDefinition(var26); - if (var18.transforms != null) { - var18 = var18.transform(); - } + if (var1.notedId != -1) { // L: 92 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } - if (var18 == null) { - continue; - } + if (var1.placeholderTemplate != -1) { // L: 93 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } - if (Client.isItemSelected == 1) { - GameBuild.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(65535) + var18.name, 1, var26, var11, var12); - } else if (Client.isSpellSelected) { - if ((ObjectComposition.selectedSpellFlags & 4) == 4) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(65535) + var18.name, 2, var26, var11, var12); - } - } else { - String[] var19 = var18.actions; - if (var19 != null) { - for (int var20 = 4; var20 >= 0; --var20) { - if (var19[var20] != null) { - short var21 = 0; - if (var20 == 0) { - var21 = 3; - } + if (!BuddyRankComparator.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 + var1.name = "Members object"; // L: 95 + var1.isTradable = false; // L: 96 - if (var20 == 1) { - var21 = 4; - } + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97 + var1.groundActions[var3] = null; // L: 98 + } - if (var20 == 2) { - var21 = 5; - } - - if (var20 == 3) { - var21 = 6; - } - - if (var20 == 4) { - var21 = 1001; - } - - GameBuild.insertMenuItemNoShift(var19[var20], FloorUnderlayDefinition.colorStartTag(65535) + var18.name, var21, var17, var11, var13); - } - } - } - - GameBuild.insertMenuItemNoShift("Examine", FloorUnderlayDefinition.colorStartTag(65535) + var18.name, 1002, var18.id, var11, var13); + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100 + if (var3 != 4) { // L: 101 + var1.inventoryActions[var3] = null; // L: 102 } } - Player var22; - int var27; - NPC var28; - int var35; - int[] var36; - if (var15 == 1) { - NPC var31 = Client.npcs[var17]; - if (var31 == null) { - continue; - } + var1.shiftClickIndex = -2; // L: 105 + var1.team = 0; // L: 106 + if (var1.params != null) { // L: 107 + boolean var6 = false; // L: 108 - 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 && var31 != var28 && var28.definition.size == 1 && var31.x == var28.x && var31.y == var28.y) { - class275.addNpcToMenu(var28.definition, Client.npcIndices[var27], var11, var13); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var22 = Client.players[var36[var35]]; - if (var22 != null && var31.x == var22.x && var22.y == var31.y) { - ScriptFrame.addPlayerToMenu(var22, var36[var35], var11, var13); - } + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109 + ParamComposition var5 = Buffer.getParamDefinition((int)var4.key); // L: 110 + if (var5.autoDisable) { // L: 111 + var4.remove(); + } else { + var6 = true; // L: 112 } } - class275.addNpcToMenu(var31.definition, var17, var11, var13); - } - - if (var15 == 0) { - Player var32 = Client.players[var17]; - if (var32 == null) { - continue; - } - - 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 && var28.y == var32.y) { - class275.addNpcToMenu(var28.definition, Client.npcIndices[var27], var11, var13); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var22 = Client.players[var36[var35]]; - if (var22 != null && var22 != var32 && var22.x == var32.x && var22.y == var32.y) { - ScriptFrame.addPlayerToMenu(var22, var36[var35], var11, var13); - } - } - } - - if (var17 != Client.combatTargetPlayerIndex) { - ScriptFrame.addPlayerToMenu(var32, var17, var11, var13); - } else { - var4 = var24; - } - } - - if (var15 == 3) { - NodeDeque var34 = Client.groundItems[VertexNormal.Client_plane][var11][var13]; - if (var34 != null) { - for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { - ItemComposition var37 = class87.ItemDefinition_get(var33.id); - if (Client.isItemSelected == 1) { - GameBuild.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16748608) + var37.name, 16, var33.id, var11, var13); - } else if (Client.isSpellSelected) { - if ((ObjectComposition.selectedSpellFlags & 1) == 1) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16748608) + var37.name, 17, var33.id, var11, var13); - } - } else { - String[] var29 = var37.groundActions; - - for (int var30 = 4; var30 >= 0; --var30) { - if (var29 != null && var29[var30] != null) { - byte var23 = 0; - if (var30 == 0) { - var23 = 18; - } - - if (var30 == 1) { - var23 = 19; - } - - if (var30 == 2) { - var23 = 20; - } - - if (var30 == 3) { - var23 = 21; - } - - if (var30 == 4) { - var23 = 22; - } - - GameBuild.insertMenuItemNoShift(var29[var30], FloorUnderlayDefinition.colorStartTag(16748608) + var37.name, var23, var33.id, var11, var13); - } else if (var30 == 2) { - GameBuild.insertMenuItemNoShift("Take", FloorUnderlayDefinition.colorStartTag(16748608) + var37.name, 20, var33.id, var11, var13); - } - } - - GameBuild.insertMenuItemNoShift("Examine", FloorUnderlayDefinition.colorStartTag(16748608) + var37.name, 1004, var33.id, var11, var13); - } - } + if (!var6) { + var1.params = null; // L: 114 } } } - } - if (-1L != var4) { - var8 = Widget.method5030(var4); - int var9 = ItemComposition.method3327(var4); - Player var10 = Client.players[Client.combatTargetPlayerIndex]; - ScriptFrame.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 + return var1; // L: 118 } - } - @ObfuscatedName("il") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Ljt;Ljt;ZB)V", - garbageValue = "8" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1243234471" ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1993150083 * 873320405 : var1.width * -2019463933 * -351378005; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1068415699 * -118379173 : var1.height * 1232982299 * -1955651309; - WorldMapSection1.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - WorldMapSection1.resizeInterface(var1.children, var1.id, var3, var4, var2); + public static int method2881(CharSequence var0) { + return AttackOption.method2304(var0, 10, true); // L: 76 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lko;II)Loe;", + garbageValue = "1045837880" + ) + public static IndexedSprite method2882(AbstractArchive var0, int var1) { + byte[] var3 = var0.takeFileFlat(var1); // L: 129 + boolean var2; + if (var3 == null) { // L: 130 + var2 = false; // L: 131 + } else { + Script.SpriteBuffer_decode(var3); // L: 134 + var2 = true; // L: 135 } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - Canvas.method380(var5.group, var3, var4, var2); - } - - if (var1.contentType == 1337) { + return !var2 ? null : WorldMapArea.method3654(); // L: 137 138 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-753625264" + ) + public static int[] method2879() { + int[] var0 = new int[KeyHandler.field135]; // L: 242 + + for (int var1 = 0; var1 < KeyHandler.field135; ++var1) { // L: 243 + var0[var1] = KeyHandler.field127[var1]; // L: 244 } + return var0; // L: 246 } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index d56dcffd9a..bfb918162d 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,191 +3,191 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gt") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("averageRGB") int averageRGB; - @ObfuscatedName("k") - boolean field2295; - @ObfuscatedName("t") + @ObfuscatedName("g") + boolean field2297; + @ObfuscatedName("e") @Export("fileIds") int[] fileIds; - @ObfuscatedName("a") - int[] field2297; - @ObfuscatedName("e") - int[] field2298; - @ObfuscatedName("i") - int[] field2293; - @ObfuscatedName("y") + @ObfuscatedName("p") + int[] field2301; + @ObfuscatedName("j") + int[] field2302; + @ObfuscatedName("b") + int[] field2303; + @ObfuscatedName("x") @Export("animationDirection") int animationDirection; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("pixels") int[] pixels; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) Texture(Buffer var1) { - this.isLoaded = false; - this.averageRGB = var1.readUnsignedShort(); - this.field2295 = var1.readUnsignedByte() == 1; - int var2 = var1.readUnsignedByte(); - if (var2 >= 1 && var2 <= 4) { - this.fileIds = new int[var2]; + this.isLoaded = false; // L: 25 + this.averageRGB = var1.readUnsignedShort(); // L: 29 + this.field2297 = 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 int var3; - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 36 this.fileIds[var3] = var1.readUnsignedShort(); } - if (var2 > 1) { - this.field2297 = new int[var2 - 1]; + if (var2 > 1) { // L: 37 + this.field2301 = new int[var2 - 1]; // L: 38 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2297[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 + this.field2301[var3] = var1.readUnsignedByte(); } } - if (var2 > 1) { - this.field2298 = new int[var2 - 1]; + if (var2 > 1) { // L: 41 + this.field2302 = new int[var2 - 1]; // L: 42 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2298[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 + this.field2302[var3] = var1.readUnsignedByte(); } } - this.field2293 = new int[var2]; + this.field2303 = new int[var2]; // L: 45 - for (var3 = 0; var3 < var2; ++var3) { - this.field2293[var3] = var1.readInt(); + for (var3 = 0; var3 < var2; ++var3) { // L: 46 + this.field2303[var3] = var1.readInt(); } - this.animationDirection = var1.readUnsignedByte(); - this.animationSpeed = var1.readUnsignedByte(); - this.pixels = null; + this.animationDirection = var1.readUnsignedByte(); // L: 47 + this.animationSpeed = var1.readUnsignedByte(); // L: 48 + this.pixels = null; // L: 49 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 33 } - } + } // L: 50 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(DILkl;)Z" + descriptor = "(DILko;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; - for (var5 = 0; var5 < this.fileIds.length; ++var5) { - if (var4.getFileFlat(this.fileIds[var5]) == null) { + for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 + if (var4.getFileFlat(this.fileIds[var5]) == null) { // L: 54 return false; } } - var5 = var3 * var3; - this.pixels = new int[var5]; + var5 = var3 * var3; // L: 56 + this.pixels = new int[var5]; // L: 57 - for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = StructComposition.method3153(var4, this.fileIds[var6]); - var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field2293[var6]; - if ((var10 & -16777216) == 16777216) { + for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 + IndexedSprite var7 = TaskHandler.method2882(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.field2303[var6]; // L: 63 + if ((var10 & -16777216) == 16777216) { // L: 64 } - if ((var10 & -16777216) == 33554432) { + if ((var10 & -16777216) == 33554432) { // L: 65 } int var11; int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; + if ((var10 & -16777216) == 50331648) { // L: 66 + var11 = var10 & 16711935; // L: 67 + var12 = var10 >> 8 & 255; // L: 68 - 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 (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 (var11 = 0; var11 < var9.length; ++var11) { + for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { + if (var6 == 0) { // L: 79 var11 = 0; } else { - var11 = this.field2297[var6 - 1]; + var11 = this.field2301[var6 - 1]; // L: 80 } - if (var11 == 0) { - if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { + if (var11 == 0) { // L: 81 + if (var3 == var7.subWidth) { // L: 82 + for (var12 = 0; var12 < var5; ++var12) { // L: 83 this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 + var12 = 0; // L: 86 - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { + for (var13 = 0; var13 < var3; ++var13) { // L: 87 + for (var14 = 0; var14 < var3; ++var14) { // L: 88 this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { - throw new RuntimeException(); + if (var7.subWidth != 128 || var3 != 64) { // L: 91 + throw new RuntimeException(); // L: 98 } - var12 = 0; + var12 = 0; // L: 92 - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { + for (var13 = 0; var13 < var3; ++var13) { // L: 93 + for (var14 = 0; var14 < var3; ++var14) { // L: 94 this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var11 == 1) { // L: 101 } - if (var11 == 2) { + if (var11 == 2) { // L: 102 } - if (var11 == 3) { + if (var11 == 3) { // L: 103 } } - return true; + return true; // L: 105 } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("reset") void reset() { - this.pixels = null; - } + this.pixels = null; // L: 109 + } // L: 110 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("animate") void animate(int var1) { - if (this.pixels != null) { + if (this.pixels != null) { // L: 113 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) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 117 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 118 } - var3 = this.pixels.length; - var4 = var2 * this.animationSpeed * var1; - var5 = var3 - 1; - if (this.animationDirection == 1) { + var3 = this.pixels.length; // L: 119 + var4 = var2 * this.animationSpeed * var1; // L: 120 + var5 = var3 - 1; // L: 121 + if (this.animationDirection == 1) { // L: 122 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { - var7 = var6 + var4 & var5; - Texture_animatedPixels[var6] = this.pixels[var7]; + for (var6 = 0; var6 < var3; ++var6) { // L: 123 + var7 = var6 + var4 & var5; // L: 124 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 127 + this.pixels = Texture_animatedPixels; // L: 128 + Texture_animatedPixels = var10; // L: 129 } - if (this.animationDirection == 2 || this.animationDirection == 4) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 134 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 135 } - var3 = this.pixels.length; - var4 = this.animationSpeed * var1; - var5 = var2 - 1; - if (this.animationDirection == 2) { + var3 = this.pixels.length; // L: 136 + var4 = this.animationSpeed * var1; // L: 137 + var5 = var2 - 1; // L: 138 + if (this.animationDirection == 2) { // L: 139 var4 = -var4; } - for (var6 = 0; var6 < var3; var6 += var2) { - for (var7 = 0; var7 < var2; ++var7) { - int var8 = var6 + var7; - int var9 = var6 + (var7 + var4 & var5); - Texture_animatedPixels[var8] = this.pixels[var9]; + for (var6 = 0; var6 < var3; var6 += var2) { // L: 140 + for (var7 = 0; var7 < var2; ++var7) { // L: 141 + int var8 = var6 + var7; // L: 142 + int var9 = var6 + (var7 + var4 & var5); // L: 143 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 144 } } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 147 + this.pixels = Texture_animatedPixels; // L: 148 + Texture_animatedPixels = var10; // L: 149 } } - } + } // L: 151 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 2dab59a5f1..df7eea3683 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("ht") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1743192270" + garbageValue = "-1224332246" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-100" + descriptor = "(II)I", + garbageValue = "1611848046" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "172178592" + garbageValue = "-2069406256" ) - boolean vmethod4565(int var1); + boolean vmethod4636(int var1); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "894427577" + descriptor = "(IB)Z", + garbageValue = "-40" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 43ac51149a..1687053644 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,325 +1,249 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hr") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("ei") - @ObfuscatedSignature( - descriptor = "Lky;" + @ObfuscatedName("sp") + @ObfuscatedGetter( + intValue = -2090037953 ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("l") + static int field2484; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -665510381 + ) + static int field2483; + @ObfuscatedName("fg") + @ObfuscatedGetter( + intValue = 1409941445 + ) + static int field2485; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Lgc;" + descriptor = "[Lgt;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkn;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 289326279 + intValue = 758475413 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1388522429 + intValue = -1477381643 ) @Export("remaining") int remaining; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("brightness") double brightness; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1416724581 + intValue = -274056047 ) @Export("textureSize") int textureSize; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;IDI)V" + descriptor = "(Lko;Lko;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { - 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)]; + 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 - for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); - this.textures[var7[var9]] = new Texture(var10); + 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 } - } + } // L: 29 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "436377420" + garbageValue = "-1152969240" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { - int var1 = 0; - int var2 = 0; - Texture[] var3 = this.textures; + int var1 = 0; // L: 32 + int var2 = 0; // L: 33 + Texture[] var3 = this.textures; // L: 35 - 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 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 var7 = 0; var7 < var6.length; ++var7) { - int var8 = var6[var7]; - if (this.archive.method5223(var8)) { - ++var2; + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 + int var8 = var6[var7]; // L: 44 + if (this.archive.method5359(var8)) { // L: 46 + ++var2; // L: 47 } } } } - if (var1 == 0) { + if (var1 == 0) { // L: 55 return 0; } else { - return var2 * 100 / var1; + return var2 * 100 / var1; // L: 56 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; - this.clear(); - } + this.brightness = var1; // L: 60 + this.clear(); // L: 61 + } // L: 62 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1743192270" + garbageValue = "-1224332246" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { - Texture var2 = this.textures[var1]; - if (var2 != null) { - if (var2.pixels != null) { - this.deque.addLast(var2); + 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; - return var2.pixels; + return var2.pixels; // L: 70 } - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); + boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72 if (var3) { - if (this.remaining == 0) { - Texture var4 = (Texture)this.deque.removeFirst(); - var4.reset(); + if (this.remaining == 0) { // L: 74 + Texture var4 = (Texture)this.deque.removeFirst(); // L: 75 + var4.reset(); // L: 76 } else { - --this.remaining; + --this.remaining; // L: 78 } - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; + this.deque.addLast(var2); // L: 79 + var2.isLoaded = true; // L: 80 + return var2.pixels; // L: 81 } } - return null; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-100" - ) - @Export("getAverageTextureRGB") - public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "172178592" - ) - public boolean vmethod4565(int var1) { - return this.textures[var1].field2295; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "894427577" - ) - @Export("isLowDetail") - public boolean isLowDetail(int var1) { - return this.textureSize == 64; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" - ) - @Export("clear") - public void clear() { - for (int var1 = 0; var1 < this.textures.length; ++var1) { - if (this.textures[var1] != null) { - this.textures[var1].reset(); - } - } - - this.deque = new NodeDeque(); - this.remaining = this.capacity; + return null; // L: 84 } @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1611848046" + ) + @Export("getAverageTextureRGB") + public int getAverageTextureRGB(int var1) { + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-2069406256" + ) + public boolean vmethod4636(int var1) { + return this.textures[var1].field2297; // L: 93 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-40" + ) + @Export("isLowDetail") + public boolean isLowDetail(int var1) { + return this.textureSize == 64; // L: 97 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1198154023" + ) + @Export("clear") + public void clear() { + for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 + if (this.textures[var1] != null) { // L: 102 + this.textures[var1].reset(); + } + } + + this.deque = new NodeDeque(); // L: 104 + this.remaining = this.capacity; // L: 105 + } // L: 106 + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1075488432" + garbageValue = "-1882737028" ) @Export("animate") public void animate(int var1) { - 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; + 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 } } - } + } // L: 116 - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;ZIB)V", - garbageValue = "0" + descriptor = "(II)I", + garbageValue = "691023911" ) - static void method4433(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { - if (var3 == 4) { - class112.method2474(4); - } - - } else { - if (var3 == 0) { - byte var4; - if (class21.client.method1338()) { - var4 = 10; - } else { - var4 = 0; - } - - class112.method2474(var4); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - MouseHandler.field236 = 0; - Ignored.otp = ""; - } - - Login.method1930(); - class14.method175(); - } else { - class112.method2474(var3); - } - - Rasterizer2D.Rasterizer2D_clear(); - byte[] var10 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = class135.convertJpgToSprite(var10); - Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - int var5 = Client.worldProperties; - if ((var5 & 536870912) != 0) { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var5 & 1073741824) != 0) { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - SoundCache.titleboxSprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - class132.titlebuttonSprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.field873 = class131.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); - class4.field8 = class131.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); - class131.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); - int var7 = var1.getGroupId("runes"); - int var8 = var1.getFileId(var7, ""); - IndexedSprite[] var6 = KitDefinition.method2934(var1, var7, var8); - Login.runesSprite = var6; - var8 = var1.getGroupId("title_mute"); - int var9 = var1.getFileId(var8, ""); - IndexedSprite[] var11 = KitDefinition.method2934(var1, var8, var9); - class16.title_muteSprite = var11; - class397.options_buttons_0Sprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - Login.field876 = class131.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - FileSystem.options_buttons_2Sprite = class131.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field877 = class131.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - GrandExchangeOfferTotalQuantityComparator.field3741 = class397.options_buttons_0Sprite.subWidth; - class20.field103 = class397.options_buttons_0Sprite.subHeight; - Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - MouseHandler.field236 = 0; - Ignored.otp = ""; - Login.field900 = true; - Login.worldSelectOpen = false; - if (!WorldMapDecorationType.clientPreferences.titleMusicDisabled) { - WorldMapManager.method3727(2, Tiles.archive6, "scape main", "", 255, false); - } else { - CollisionMap.method3417(2); - } - - if (NetCache.NetCache_socket != null) { - try { - Buffer var12 = new Buffer(4); - var12.writeByte(3); - var12.writeMedium(0); - NetCache.NetCache_socket.write(var12.array, 0, 4); - } catch (IOException var15) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var14) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = true; - Login.xPadding = (Huffman.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class78.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - ClanChannelMember.logoSprite.drawAt(Login.xPadding + 382 - ClanChannelMember.logoSprite.subWidth / 2, 18); - } + public static int method4518(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 69 + int var1 = (int)(var2 >>> 7 & 127L); // L: 71 + return var1; // L: 73 } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-19" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + HealthBar.method2242(); // L: 11769 + if (AbstractArchive.friendsChat != null) { // L: 11770 + AbstractArchive.friendsChat.invalidateIgnoreds(); // L: 11771 + } + + } // L: 11773 } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 6fd121e75f..36d1aef66a 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,176 +1,166 @@ -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("hm") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("ft") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("ph") - @ObfuscatedSignature( - descriptor = "Lcf;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -913512681 + intValue = 1187368655 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1268550147 + intValue = 1125314613 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1887131347 + intValue = -1288343165 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -761349413 + intValue = -2016823625 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhg;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhs;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lhb;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lhn;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgq;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgy;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2125458223 + intValue = -2026350351 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lhw;" + descriptor = "[Lhv;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1275405715 + intValue = -1565672135 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 438539079 + intValue = 871362815 ) @Export("minPlane") int minPlane; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("x") + @ObfuscatedName("z") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -885252955 + intValue = 46156027 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1714438525 + intValue = 1657117369 ) - int field2323; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1462551243 - ) - int field2336; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1356919353 - ) - int field2337; + int field2328; @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1842034825 + ) + int field2340; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 72830829 + ) + int field2334; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhm;" ) @Export("linkedBelowTile") Tile linkedBelowTile; Tile(int var1, int var2, int var3) { - this.gameObjects = new GameObject[5]; - this.gameObjectEdgeMasks = new int[5]; - this.gameObjectsEdgeMask = 0; - this.originalPlane = this.plane = var1; - this.x = var2; - this.y = 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)Lis;", - garbageValue = "-97" + descriptor = "(Lck;B)V", + garbageValue = "63" ) - public static PacketBufferNode method4117() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + SoundSystem.runScript(var0, 500000, 475000); // L: 110 + } // L: 111 - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-2102466503" + descriptor = "(II)I", + garbageValue = "-839277763" ) - public static int[] method4116() { - int[] var0 = new int[KeyHandler.field140]; - - for (int var1 = 0; var1 < KeyHandler.field140; ++var1) { - var0[var1] = KeyHandler.field137[var1]; - } - - return var0; + public static int method4199(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 39 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 40 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 41 + var0 += var0 >>> 8; // L: 42 + var0 += var0 >>> 16; // L: 43 + return var0 & 255; // L: 44 } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 8b1121563d..8afebd40b8 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -3,125 +3,187 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cv") +@ObfuscatedName("cu") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("tu") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("l") + @ObfuscatedName("b") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1760777195 + intValue = 1808004397 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2008394151 + intValue = 86288183 ) @Export("quantity") int quantity; TileItem() { - } + } // L: 11 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lhl;", - garbageValue = "126" + descriptor = "(I)Lhl;", + garbageValue = "461766541" ) @Export("getModel") protected final Model getModel() { - return class87.ItemDefinition_get(this.id).getModel(this.quantity); + return TaskHandler.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(CLkn;I)C", - garbageValue = "1899420979" + descriptor = "(IS)Z", + garbageValue = "26741" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } + public static boolean method2316(int var0) { + return (var0 >> 29 & 1) != 0; // L: 29 + } - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } - } - - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILbp;ZS)I", + garbageValue = "32102" + ) + static int method2309(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3220 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3221 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = TaskHandler.ItemDefinition_get(var3).name; // L: 3222 + return 1; // L: 3223 } else { - return var0 == 376 ? 'Y' : var0; + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3225 + class14.Interpreter_intStackSize -= 2; // L: 3226 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3227 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3228 + var5 = TaskHandler.ItemDefinition_get(var3); // L: 3229 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3230 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3231 + } + + return 1; // L: 3232 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3234 + class14.Interpreter_intStackSize -= 2; // L: 3235 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3236 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3237 + var5 = TaskHandler.ItemDefinition_get(var3); // L: 3238 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3239 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3240 + } + + return 1; // L: 3241 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3243 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3244 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).price; // L: 3245 + return 1; // L: 3246 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3248 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3249 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3250 + return 1; // L: 3251 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3253 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3254 + var7 = TaskHandler.ItemDefinition_get(var3); // L: 3255 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3256 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3257 + } + + return 1; // L: 3258 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3260 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3261 + var7 = TaskHandler.ItemDefinition_get(var3); // L: 3262 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3263 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3264 + } + + return 1; // L: 3265 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3267 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3268 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3269 + return 1; // L: 3270 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3272 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3273 + var7 = TaskHandler.ItemDefinition_get(var3); // L: 3274 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3275 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3276 + } + + return 1; // L: 3277 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3279 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3280 + var7 = TaskHandler.ItemDefinition_get(var3); // L: 3281 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3282 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3283 + } + + return 1; // L: 3284 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3286 + String var6 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3287 + var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3288 + KeyHandler.findItemDefinitions(var6, var4 == 1); // L: 3289 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Skeleton.foundItemIdCount; // L: 3290 + return 1; // L: 3291 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3293 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3298 + ClanSettings.foundItemIndex = 0; // L: 3299 + return 1; // L: 3300 + } else if (var0 == 4213) { // L: 3302 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3303 + var4 = TaskHandler.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3304 + if (var4 == -1) { // L: 3305 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4; // L: 3306 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4 + 1; // L: 3309 + } + + return 1; // L: 3311 + } else { + return 2; // L: 3313 + } + } else { + if (Language.foundItemIds != null && ClanSettings.foundItemIndex < Skeleton.foundItemIdCount) { // L: 3294 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Language.foundItemIds[++ClanSettings.foundItemIndex - 1] & '\uffff'; // L: 3295 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3296 + } + } } } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-120" + ) + static final void method2315() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11776 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11777 + var1.clearIsInFriendsChat(); // L: 11778 + } + + } // L: 11780 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 802d815fa2..e7d5874403 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,181 +4,105 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bb") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 824712715 + intValue = -543574297 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("Tiles_underlays") static byte[][][] Tiles_underlays; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Tiles_overlays") static byte[][][] Tiles_overlays; + @ObfuscatedName("g") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; @ObfuscatedName("e") - static int[][] field981; + static byte[][][] field969; @ObfuscatedName("y") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("w") @Export("Tiles_lightness") static int[] Tiles_lightness; - @ObfuscatedName("v") - static int[] field984; - @ObfuscatedName("p") - static final int[] field985; - @ObfuscatedName("z") - static final int[] field986; - @ObfuscatedName("h") - static final int[] field987; - @ObfuscatedName("o") - static final int[] field988; + @ObfuscatedName("l") + static int[][][] field962; + @ObfuscatedName("q") + static final int[] field964; + @ObfuscatedName("d") + static final int[] field967; @ObfuscatedName("r") - static final int[] field980; - @ObfuscatedName("n") - static final int[] field979; - @ObfuscatedName("u") + static final int[] field966; + @ObfuscatedName("m") + static final int[] field960; + @ObfuscatedName("c") + static final int[] field957; + @ObfuscatedName("f") + static final int[] field970; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1532295663 + intValue = 172929931 ) @Export("rndHue") static int rndHue; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1213635893 + intValue = -1118962133 ) @Export("rndLightness") static int rndLightness; - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive6") - static Archive archive6; + @ObfuscatedName("bv") + @Export("otp") + static String otp; static { - Tiles_heights = new int[4][105][105]; - Tiles_renderFlags = new byte[4][104][104]; - Tiles_minPlane = 99; - field985 = new int[]{1, 2, 4, 8}; - field986 = new int[]{16, 32, 64, 128}; - field987 = new int[]{1, 0, -1, 0}; - field988 = new int[]{0, -1, 0, 1}; - field980 = new int[]{1, -1, -1, 1}; - field979 = new int[]{-1, -1, 1, 1}; - rndHue = (int)(Math.random() * 17.0D) - 8; - rndLightness = (int)(Math.random() * 33.0D) - 16; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)Lbe;", - garbageValue = "-911712342" - ) - static Script method2023(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = UserComparator6.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = UserComparator6.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = GrandExchangeOfferOwnWorldComparator.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - - return null; - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1127326674" - ) - public static boolean method2024(int var0) { - return (var0 >> 30 & 1) != 0; + Tiles_heights = new int[4][105][105]; // L: 16 + Tiles_renderFlags = new byte[4][104][104]; // L: 17 + Tiles_minPlane = 99; // L: 18 + field964 = new int[]{1, 2, 4, 8}; // L: 34 + field967 = new int[]{16, 32, 64, 128}; // L: 35 + field966 = new int[]{1, 0, -1, 0}; // L: 36 + field960 = new int[]{0, -1, 0, 1}; // L: 37 + field957 = new int[]{1, -1, -1, 1}; // L: 38 + field970 = new int[]{-1, -1, 1, 1}; // L: 39 + rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40 + rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-965136856" + descriptor = "(IS)Z", + garbageValue = "151" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } + public static boolean method2045(int var0) { + return (var0 >> 30 & 1) != 0; // L: 33 } - @ObfuscatedName("w") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1813758002" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-98" ) - public static String method2025(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10199 - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - char var6; - if (var5 != 181 && var5 != 402) { - var6 = Character.toTitleCase(var5); - } else { - var6 = var5; - } - - var5 = var6; - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10200 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10201 } - return new String(var2); + if (var1.length() > 9) { // L: 10203 + return " " + MouseHandler.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + MouseHandler.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + MouseHandler.colorStartTag(16776960) + var1 + ""; // L: 10204 10205 + } } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 61d1247860..980f97a95d 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -1,221 +1,152 @@ -import java.io.DataInputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lo") @Implements("Timer") public class Timer { - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 4604634088855325369L - ) - long field3911; - @ObfuscatedName("q") - @ObfuscatedGetter( - longValue = -7952727671198332901L - ) - long field3904; - @ObfuscatedName("f") - public boolean field3905; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = -5361475612700650265L - ) - long field3909; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = 2894173313934874305L - ) - long field3907; - @ObfuscatedName("k") - @ObfuscatedGetter( - longValue = -7914269396143437043L - ) - long field3914; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1222390905 - ) - int field3908; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1927973715 - ) - int field3910; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1169062673 - ) - int field3906; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1836346517 + longValue = 4485476439573351559L ) - int field3912; + long field3896; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = 6376917815787743615L + ) + long field3895; + @ObfuscatedName("s") + public boolean field3900; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = 357962707005069125L + ) + long field3897; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = -7413813924228279315L + ) + long field3898; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = -3703343557375834617L + ) + long field3894; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1540289443 + ) + int field3899; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 407913171 + ) + int field3901; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1614050671 + ) + int field3902; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -18152441 + ) + int field3903; public Timer() { - this.field3911 = -1L; - this.field3904 = -1L; - this.field3905 = false; - this.field3909 = 0L; - this.field3907 = 0L; - this.field3914 = 0L; - this.field3908 = 0; - this.field3910 = 0; - this.field3906 = 0; - this.field3912 = 0; + this.field3896 = -1L; // L: 7 + this.field3895 = -1L; // L: 8 + this.field3900 = false; // L: 9 + this.field3897 = 0L; // L: 10 + this.field3898 = 0L; // L: 11 + this.field3894 = 0L; // L: 12 + this.field3899 = 0; // L: 13 + this.field3901 = 0; // L: 14 + this.field3902 = 0; // L: 15 + this.field3903 = 0; // L: 16 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "114" - ) - public void method5903() { - this.field3911 = UserComparator4.method2406(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-75" - ) - public void method5904() { - if (-1L != this.field3911) { - this.field3907 = UserComparator4.method2406() - this.field3911; - this.field3911 = -1L; - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "18294445" - ) - public void method5905(int var1) { - this.field3904 = UserComparator4.method2406(); - this.field3908 = var1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "87" - ) - public void method5906() { - if (this.field3904 != -1L) { - this.field3909 = UserComparator4.method2406() - this.field3904; - this.field3904 = -1L; - } - - ++this.field3906; - this.field3905 = true; - } - - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1510248408" + garbageValue = "65280" ) - public void method5907() { - this.field3905 = false; - this.field3910 = 0; - } + public void method5972() { + this.field3896 = class111.method2516(); // L: 19 + } // L: 20 - @ObfuscatedName("k") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2132857745" + garbageValue = "1321149777" ) - public void method5908() { - this.method5906(); - } + public void method5978() { + if (-1L != this.field3896) { // L: 23 + this.field3898 = class111.method2516() - this.field3896; // L: 24 + this.field3896 = -1L; // L: 25 + } - @ObfuscatedName("t") + } // L: 27 + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-205261930" + descriptor = "(IB)V", + garbageValue = "119" + ) + public void method5973(int var1) { + this.field3895 = class111.method2516(); // L: 30 + this.field3899 = var1; // L: 31 + } // L: 32 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "229876245" + ) + public void method5974() { + if (this.field3895 != -1L) { // L: 35 + this.field3897 = class111.method2516() - this.field3895; // L: 36 + this.field3895 = -1L; // L: 37 + } + + ++this.field3902; // L: 39 + this.field3900 = true; // L: 40 + } // L: 41 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1931068869" + ) + public void method5975() { + this.field3900 = false; // L: 44 + this.field3901 = 0; // L: 45 + } // L: 46 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1431059239" + ) + public void method5970() { + this.method5974(); // L: 49 + } // L: 50 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "417956413" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3907; - var2 /= 10L; - if (var2 < 0L) { - var2 = 0L; - } else if (var2 > 65535L) { - var2 = 65535L; - } - - var1.writeShort((int)var2); - long var4 = this.field3909; - var4 /= 10L; - if (var4 < 0L) { - var4 = 0L; - } else if (var4 > 65535L) { - var4 = 65535L; - } - - var1.writeShort((int)var4); - long var6 = this.field3914; - var6 /= 10L; - if (var6 < 0L) { - var6 = 0L; - } else if (var6 > 65535L) { - var6 = 65535L; - } - - var1.writeShort((int)var6); - var1.writeShort(this.field3908); - var1.writeShort(this.field3910); - var1.writeShort(this.field3906); - var1.writeShort(this.field3912); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "225667152" - ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = GameBuild.method5123(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } + class264.method5144(var1, this.field3898); // L: 53 + class264.method5144(var1, this.field3897); // L: 54 + class264.method5144(var1, this.field3894); // L: 55 + var1.writeShort(this.field3899); // L: 56 + var1.writeShort(this.field3901); // L: 57 + var1.writeShort(this.field3902); // L: 58 + var1.writeShort(this.field3903); // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index f969cff5e5..1e3168cfbc 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,47 +1,93 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mv") @Implements("TriBool") public class TriBool { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmv;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("z") + @ObfuscatedName("c") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "[Loe;" ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("ps") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - static class387 field3979; + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; static { - TriBool_unknown = new TriBool(); - TriBool_true = new TriBool(); - TriBool_false = new TriBool(); + TriBool_unknown = new TriBool(); // L: 4 + TriBool_true = new TriBool(); // L: 5 + TriBool_false = new TriBool(); // L: 6 } TriBool() { + } // L: 8 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)Ljava/io/File;", + garbageValue = "17902" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 22 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 + RandomAccessFile var3 = null; // L: 26 + + try { + File var4 = new File(var2.getParent()); // L: 28 + if (!var4.exists()) { // L: 29 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 30 + int var5 = var3.read(); // L: 31 + var3.seek(0L); // L: 32 + var3.write(var5); // L: 33 + var3.seek(0L); // L: 34 + var3.close(); // L: 35 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 + return var2; // L: 37 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 41 + var3.close(); // L: 42 + var3 = null; // L: 43 + } + } catch (Exception var7) { // L: 46 + } + + throw new RuntimeException(); // L: 48 + } + } + } } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 8500a85b3f..1dc21d1681 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -5,59 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cm") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("ho") + @ObfuscatedName("sk") @ObfuscatedGetter( - intValue = 1113835115 + intValue = -669025737 ) - static int field1313; - @ObfuscatedName("l") + static int field1298; + @ObfuscatedName("i") @Export("url") final URL url; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; - } + this.url = var1; // L: 96 + } // L: 97 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-713550106" + descriptor = "(B)Z", + garbageValue = "-2" ) @Export("isDone") public boolean isDone() { - return this.isDone0; + return this.isDone0; // L: 100 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-490432666" + garbageValue = "-1773825191" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; + return this.response0; // L: 104 } - @ObfuscatedName("kf") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "-1" + descriptor = "(IZZZB)Lkd;", + garbageValue = "0" ) - public static void method2386(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2750, Client.packetWriter.isaacCipher); - var4.packetBuffer.method7026(var2); - var4.packetBuffer.writeInt(var3 ? Client.field572 * -1959883561 * -20896025 : 0); - var4.packetBuffer.method6931(var1); - var4.packetBuffer.method6931(var0); - Client.packetWriter.addNode(var4); + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 2418 + if (JagexCache.JagexCache_dat2File != null) { // L: 2419 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WorldMapID.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, WorldMapArea.masterDisk, var0, var1, var2, var3); // L: 2420 + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "9" + ) + static final boolean method2446(int var0) { + if (var0 < 0) { // L: 8251 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 8252 + if (var1 >= 2000) { // L: 8253 + var1 -= 2000; + } + + return var1 == 1007; // L: 8254 + } } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index f90c5d3f29..e6d133774a 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -9,121 +9,257 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cj") +@ObfuscatedName("cf") @Implements("UrlRequester") public class UrlRequester implements Runnable { @ObfuscatedName("g") - public static boolean field1301; - @ObfuscatedName("ac") - protected static String field1303; - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "Lep;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("l") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("i") @Export("thread") final Thread thread; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("requests") Queue requests; public UrlRequester() { - this.requests = new LinkedList(); - this.thread = new Thread(this); - this.thread.setPriority(1); - this.thread.start(); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lco;", - garbageValue = "743927819" + descriptor = "(Ljava/net/URL;B)Lcm;", + garbageValue = "56" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); - synchronized(this) { - this.requests.add(var2); - this.notify(); - return var2; + UrlRequest var2 = new UrlRequest(var1); // L: 71 + synchronized(this) { // L: 72 + this.requests.add(var2); // L: 73 + this.notify(); // L: 74 + return var2; // L: 76 } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1026366305" + descriptor = "(B)V", + garbageValue = "103" ) @Export("close") public void close() { - this.isClosed = true; + this.isClosed = true; // L: 80 try { - synchronized(this) { - this.notify(); - } + synchronized(this) { // L: 82 + this.notify(); // L: 83 + } // L: 84 - this.thread.join(); - } catch (InterruptedException var4) { + this.thread.join(); // L: 85 + } catch (InterruptedException var4) { // L: 87 } - } + } // L: 88 public void run() { - while (!this.isClosed) { + while (!this.isClosed) { // L: 24 try { UrlRequest var1; - synchronized(this) { - var1 = (UrlRequest)this.requests.poll(); - if (var1 == null) { + synchronized(this) { // L: 27 + var1 = (UrlRequest)this.requests.poll(); // L: 28 + if (var1 == null) { // L: 29 try { - this.wait(); - } catch (InterruptedException var13) { + this.wait(); // L: 31 + } catch (InterruptedException var13) { // L: 33 } continue; } } - DataInputStream var2 = null; - URLConnection var3 = null; + DataInputStream var2 = null; // L: 37 + URLConnection var3 = null; // L: 38 try { - 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; + var3 = var1.url.openConnection(); // L: 40 + var3.setConnectTimeout(5000); // L: 41 + var3.setReadTimeout(5000); // L: 42 + var3.setUseCaches(false); // L: 43 + var3.setRequestProperty("Connection", "close"); // L: 44 + int var7 = var3.getContentLength(); // L: 45 + if (var7 >= 0) { // L: 46 + byte[] var5 = new byte[var7]; // L: 47 + var2 = new DataInputStream(var3.getInputStream()); // L: 48 + var2.readFully(var5); // L: 49 + var1.response0 = var5; // L: 50 } - var1.isDone0 = true; - } catch (IOException var14) { - var1.isDone0 = true; + var1.isDone0 = true; // L: 52 + } catch (IOException var14) { // L: 54 + var1.isDone0 = true; // L: 55 } finally { - if (var2 != null) { + if (var2 != null) { // L: 58 var2.close(); } - if (var3 != null && var3 instanceof HttpURLConnection) { - ((HttpURLConnection)var3).disconnect(); + if (var3 != null && var3 instanceof HttpURLConnection) { // L: 59 + ((HttpURLConnection)var3).disconnect(); // L: 60 } } - } catch (Exception var17) { - Timer.RunException_sendStackTrace((String)null, var17); + } catch (Exception var17) { // L: 64 + MilliClock.RunException_sendStackTrace((String)null, var17); // L: 65 } } + } // L: 68 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-1444939304" + ) + static int method2427(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1916 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.cycle; // L: 1917 + return 1; // L: 1918 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1920 + class14.Interpreter_intStackSize -= 2; // L: 1921 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1922 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1923 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Script.method1988(var3, var4); // L: 1924 + return 1; // L: 1925 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1927 + class14.Interpreter_intStackSize -= 2; // L: 1928 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1929 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1930 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.ItemContainer_getCount(var3, var4); // L: 1931 + return 1; // L: 1932 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1934 + class14.Interpreter_intStackSize -= 2; // L: 1935 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1936 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1937 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapSectionType.method3920(var3, var4); // L: 1938 + return 1; // L: 1939 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1941 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1942 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AttackOption.getInvDefinition(var3).size; // L: 1943 + return 1; // L: 1944 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1946 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1947 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1948 + return 1; // L: 1949 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1951 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1952 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1953 + return 1; // L: 1954 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1956 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1957 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1958 + return 1; // L: 1959 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1961 + var3 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 1962 + var4 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 1963 + var5 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 1964 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1965 + return 1; // L: 1966 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1968 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1969 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1970 + return 1; // L: 1971 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1973 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1974 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1975 + return 1; // L: 1976 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1978 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1979 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1980 + return 1; // L: 1981 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1983 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1984 + return 1; // L: 1985 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1987 + class14.Interpreter_intStackSize -= 2; // L: 1988 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 1989 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1990 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Script.method1988(var3, var4); // L: 1991 + return 1; // L: 1992 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1994 + class14.Interpreter_intStackSize -= 2; // L: 1995 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 1996 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1997 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.ItemContainer_getCount(var3, var4); // L: 1998 + return 1; // L: 1999 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2001 + class14.Interpreter_intStackSize -= 2; // L: 2002 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 2003 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2004 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapSectionType.method3920(var3, var4); // L: 2005 + return 1; // L: 2006 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2008 + if (Client.staffModLevel >= 2) { // L: 2009 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2010 + } + + return 1; // L: 2011 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2013 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2014 + return 1; // L: 2015 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2017 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.worldId; // L: 2018 + return 1; // L: 2019 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2021 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2022 + return 1; // L: 2023 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2025 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.weight; // L: 2026 + return 1; // L: 2027 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2029 + if (Client.playerMod) { // L: 2030 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2031 + } + + return 1; // L: 2032 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2034 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2035 + return 1; // L: 2036 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2038 + class14.Interpreter_intStackSize -= 4; // L: 2039 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2040 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2041 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2042 + int var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 2043 + var3 += var4 << 14; // L: 2044 + var3 += var5 << 28; // L: 2045 + var3 += var6; // L: 2046 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 2047 + return 1; // L: 2048 + } else if (var0 == 3326) { // L: 2050 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field475; // L: 2051 + return 1; // L: 2052 + } else if (var0 == 3327) { // L: 2054 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field476; // L: 2055 + return 1; // L: 2056 + } else { + return 2; // L: 2058 + } + } + } } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index f68169f3d7..6c914358ef 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,81 +3,81 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("la") @Implements("User") public class User implements Comparable { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpb;" ) @Export("username") Username username; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lpm;" + descriptor = "Lpb;" ) @Export("previousUsername") Username previousUsername; User() { - } + } // L: 9 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Llu;B)I", - garbageValue = "-81" + descriptor = "(Lla;I)I", + garbageValue = "-1073614160" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); + return this.username.compareToTyped(var1.username); // L: 32 } - @ObfuscatedName("r") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Lpm;", - garbageValue = "-1591035230" + descriptor = "(I)Lpb;", + garbageValue = "-1294008122" ) @Export("getUsername") public Username getUsername() { - return this.username; + return this.username; // L: 12 } - @ObfuscatedName("n") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "149819278" + garbageValue = "598510100" ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); + return this.username == null ? "" : this.username.getName(); // L: 16 17 } - @ObfuscatedName("u") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1711535592" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "56" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); + return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 } - @ObfuscatedName("d") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lpm;Lpm;I)V", - garbageValue = "-1790598798" + descriptor = "(Lpb;Lpb;I)V", + garbageValue = "1723391677" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { + if (var1 == null) { // L: 26 throw new NullPointerException(); } else { - this.username = var1; - this.previousUsername = var2; + this.username = var1; // L: 27 + this.previousUsername = var2; // L: 28 } - } + } // L: 29 public int compareTo(Object var1) { - return this.compareTo_user((User)var1); + return this.compareTo_user((User)var1); // L: 36 } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 9b7c09fcb1..2f47f283e5 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,41 +4,60 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +@ObfuscatedName("ox") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator1(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llu;Llu;B)I", - garbageValue = "-110" + descriptor = "(Lla;Lla;S)I", + garbageValue = "-7375" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); + return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); + return this.compare_bridged((User)var1, (User)var2); // L: 18 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 22 } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "725345511" + descriptor = "(Lko;Lko;Ljava/lang/String;Ljava/lang/String;I)Lle;", + garbageValue = "976267291" ) - public static int method7162(int var0) { - return Widget.method5030(ViewportMouse.ViewportMouse_entityTags[var0]); + public static Font method7234(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 102 + int var5 = var0.getFileId(var4, var3); // L: 103 + Font var6; + if (!BuddyRankComparator.method2502(var0, var4, var5)) { // L: 106 + var6 = null; // L: 107 + } else { + byte[] var8 = var1.takeFile(var4, var5); // L: 111 + Font var7; + if (var8 == null) { // L: 113 + var7 = null; // L: 114 + } else { + Font var9 = new Font(var8, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, HitSplatDefinition.SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 117 + PacketBuffer.method6913(); // L: 118 + var7 = var9; // L: 119 + } + + var6 = var7; // L: 121 + } + + return var6; // L: 123 } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 56a5d3822f..d15a505ec5 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,77 +1,53 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dp") +@ObfuscatedName("dw") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -633659883 + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "[Low;" ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("l") + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "-1753345286" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "2093372885" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("kl") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-1354304959" + descriptor = "(S)V", + garbageValue = "-4813" ) - static int method2451(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Interpreter.Widget_unpackTargetMask(WorldMapRegion.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + static final void method2494() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11783 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11784 + var1.method2105(); // L: 11785 } - } + + } // L: 11787 } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 18b173a306..0bd43d3cdf 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,35 +1,41 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +@ObfuscatedName("oy") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("l") + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 419330147 + ) + public static int field4359; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator2(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llu;Llu;B)I", - garbageValue = "-58" + descriptor = "(Lla;Lla;B)I", + garbageValue = "86" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); + return this.compare_bridged((User)var1, (User)var2); // L: 18 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 22 } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 3ece2d27a0..e13361b9c0 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,74 +1,36 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("df") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("oq") - @ObfuscatedGetter( - intValue = -1476242405 - ) - static int field1338; - @ObfuscatedName("l") + @ObfuscatedName("br") + static String field1316; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "972500816" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "1201701875" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.world != var1.world) { - return this.reversed ? var1.world - var2.world : var2.world - var1.world; + if (var2.world != var1.world) { // L: 14 + return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); - } - - @ObfuscatedName("l") - public static String method2438(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "485047246" - ) - static int method2436(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { - if (var0 == 3702) { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - --AbstractByteArrayCopier.Interpreter_intStackSize; - --class54.Interpreter_stringStackSize; - return 1; - } + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 0ce785e578..604a4320eb 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,41 +1,32 @@ +import java.security.SecureRandom; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ck") +@ObfuscatedName("co") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "[Lon;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("l") + @ObfuscatedName("fv") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator4(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "-1295595902" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "1981135103" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } public int compare(Object var1, Object var2) { @@ -43,195 +34,25 @@ public class UserComparator4 implements Comparator { } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 22 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "754804678" + descriptor = "([Lkl;IB)Lkl;", + garbageValue = "1" ) - public static final synchronized long method2406() { - long var0 = System.currentTimeMillis(); - if (var0 < class397.field4283) { - class247.field2919 += class397.field4283 - var0; - } + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; // L: 17 - class397.field4283 = var0; - return var0 + class247.field2919; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-18" - ) - public static void method2395() { - VarpDefinition.VarpDefinition_cached.clear(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(CLkn;B)I", - garbageValue = "-97" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } - - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; - } - - return var2; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1403185658" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + MilliClock.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "5" - ) - static int method2399(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class87.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class87.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class87.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class87.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class87.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = class87.ItemDefinition_get(var3); - if (var7.noteTemplate == -1 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = class87.ItemDefinition_get(var3); - if (var7.noteTemplate >= 0 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class87.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = class87.ItemDefinition_get(var3); - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = class87.ItemDefinition_get(var3); - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var6 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - WorldMapScaleHandler.findItemDefinitions(var6, var4 == 1); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = WorldMapAreaData.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - GraphicsObject.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = class87.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4 + 1; - } - - return 1; - } else { - return 2; - } - } else { - if (ObjectComposition.foundItemIds != null && GraphicsObject.foundItemIndex < WorldMapAreaData.foundItemIdCount) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ObjectComposition.foundItemIds[++GraphicsObject.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + MouseWheel var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } } + + return null; // L: 25 } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index dfdfd7d775..ba1796144c 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,66 +3,54 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dq") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "438182232" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "-1513288255" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0) { - if (var2.world == 0) { + if (var1.world != 0) { // L: 14 + if (var2.world == 0) { // L: 15 return this.reversed ? -1 : 1; } } else if (var2.world != 0) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 18 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 20 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("ge") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "576257676" + descriptor = "(Lko;IIB)[Loe;", + garbageValue = "2" ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field1109 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = class247.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - PlayerComposition.scene.drawEntity(VertexNormal.Client_plane, var2.x, var2.y, MidiPcmStream.getTileHeight(var2.field1109 * 64 - 64 + var2.x, var2.field1109 * 64 - 64 + var2.y, VertexNormal.Client_plane), var2.field1109 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } + public static IndexedSprite[] method2478(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 25 + boolean var3; + if (var4 == null) { // L: 26 + var3 = false; // L: 27 + } else { + Script.SpriteBuffer_decode(var4); // L: 30 + var3 = true; // L: 31 } + return !var3 ? null : AbstractWorldMapData.method3958(); // L: 33 34 } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 20dbbc5b21..e2d0718a09 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,125 +1,154 @@ +import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dc") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("ej") + @ObfuscatedName("aj") + static String field1340; + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Loe;" ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -863164529 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("l") + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "-2006928381" + descriptor = "(Lmt;Lmt;B)I", + garbageValue = "1" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + if (var1.world != 0 && var2.world != 0) { // L: 14 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15 } else { return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lky;II)V", - garbageValue = "1624895888" + descriptor = "(I)V", + garbageValue = "1965177576" ) - static void method2466(Archive var0, int var1) { - if (TriBool.NetCache_reference != null) { - TriBool.NetCache_reference.offset = var1 * 8 + 5; - int var2 = TriBool.NetCache_reference.readInt(); - int var3 = TriBool.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); + static void method2513() { + class300.field3765 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = SequenceDefinition.method3461((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30 + class300.field3765[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class300.field3765.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = SequenceDefinition.method3461((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class300.field3765.length; ++var0) { // L: 37 38 + class300.field3765[var0] = var4; // L: 39 + } + } + + } // L: 43 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;I)V", + garbageValue = "-1996074579" + ) + static void method2508(File var0) { + FileSystem.FileSystem_cacheDir = var0; // L: 16 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); } else { - ClanSettings.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; + FileSystem.FileSystem_hasPermissions = true; // L: 18 } - } + } // L: 19 - @ObfuscatedName("fq") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "112358019" + descriptor = "(IB)I", + garbageValue = "112" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - WorldMapDecorationType.clientPreferences.roofsHidden = !WorldMapDecorationType.clientPreferences.roofsHidden; - ScriptFrame.savePreferences(); - if (WorldMapDecorationType.clientPreferences.roofsHidden) { - GraphicsDefaults.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - GraphicsDefaults.addGameMessage(99, "", "Roofs will only be removed selectively"); - } - } - - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - TileItem.worldMap.showCoord = !TileItem.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - class20.method302(); - } - } - - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2756, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + public static int method2512(int var0) { + return class361.field4047[var0 & 16383]; // L: 32 } + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(Ljf;IIB)V", + garbageValue = "100" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11156 + if (var0 != null) { // L: 11158 + Widget var4 = BuddyRankComparator.method2501(var0); // L: 11161 + if (var4 == null) { // L: 11162 + var4 = var0.parent; + } + + if (var4 != null) { // L: 11165 + Client.clickedWidget = var0; // L: 11169 + var4 = BuddyRankComparator.method2501(var0); // L: 11172 + if (var4 == null) { // L: 11173 + var4 = var0.parent; + } + + Client.clickedWidgetParent = var4; // L: 11176 + Client.widgetClickX = var1; // L: 11177 + Client.widgetClickY = var2; // L: 11178 + class134.widgetDragDuration = 0; // L: 11179 + Client.isDraggingWidget = false; // L: 11180 + int var6 = Client.menuOptionsCount - 1; // L: 11183 + if (var6 != -1) { // L: 11186 + class12.method170(var6); + } + + return; // L: 11187 + } + } + + } + } // L: 11167 + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1324364806" + ) + static final void method2509() { + Client.field681 = Client.cycleCntr; // L: 11799 + class29.field162 = true; // L: 11800 + } // L: 11801 + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1910834630" + ) + static void method2503(int var0) { + if (var0 != Client.loginState) { // L: 12057 + Client.loginState = var0; // L: 12058 + } + } // L: 12059 } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 307eef4b05..a4321ab2f7 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,84 +1,87 @@ +import java.io.File; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("cm") +@ObfuscatedName("cb") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("mj") - @ObfuscatedGetter( - intValue = 1788791265 + @ObfuscatedName("e") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "[Loe;" ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("l") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;B)I", - garbageValue = "31" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "52692374" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + if (var1.world != 0 && var2.world != 0) { // L: 14 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2117353733" + descriptor = "(Lko;B)V", + garbageValue = "110" ) - static int method2421(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } + public static void method2463(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "-412123539" + descriptor = "(Ljava/io/File;Ljava/io/File;B)V", + garbageValue = "9" ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + static void method2470(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(class351.JagexCache_locationFile, "rw", 10000L); // L: 188 + Buffer var3 = new Buffer(500); // L: 189 + var3.writeByte(3); // L: 190 + var3.writeByte(var1 != null ? 1 : 0); // L: 191 + var3.writeCESU8(var0.getPath()); // L: 192 + if (var1 != null) { + var3.writeCESU8(""); // L: 193 + } + + var2.write(var3.array, 0, var3.offset); // L: 194 + var2.close(); // L: 195 + } catch (IOException var4) { // L: 197 + var4.printStackTrace(); // L: 198 } + + } // L: 200 + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1682455199" + ) + static boolean method2466() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10618 } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index e867f5031c..1f85429e41 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,192 +1,100 @@ -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cy") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "Lky;" + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = -1318815651 ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "Llt;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("l") + static int field1305; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;B)I", - garbageValue = "16" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "-1806283560" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { + if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; + return this.reversed ? -1 : 1; // L: 16 } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 19 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 21 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)I", - garbageValue = "7" + descriptor = "(III)I", + garbageValue = "-906484483" ) - static final int method2413(long var0, String var2) { - Random var3 = new Random(); - Buffer var4 = new Buffer(128); - Buffer var5 = new Buffer(128); - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); - var4.writeInt(var6[1]); - var4.writeLong(var0); - var4.writeLong(0L); - - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.encryptRsa(class65.field856, class65.field852); - var5.writeByte(10); - - for (var7 = 0; var7 < 3; ++var7) { - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); - var5.writeLongMedium(var3.nextLong()); - if (Client.randomDatData != null) { - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + static final int method2456(int var0, int var1) { + if (var0 == -1) { // L: 571 + return 12345678; } else { - byte[] var8 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var8); - - int var9; - for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) { - } - - if (var9 >= 24) { - throw new IOException(); - } - } catch (Exception var23) { - for (int var10 = 0; var10 < 24; ++var10) { - var8[var10] = -1; - } + var1 = (var0 & 127) * var1 / 128; // L: 572 + if (var1 < 2) { // L: 573 + var1 = 2; + } else if (var1 > 126) { // L: 574 + var1 = 126; } - var5.writeBytes(var8, 0, var8.length); - } - - var5.writeLong(var3.nextLong()); - var5.encryptRsa(class65.field856, class65.field852); - var7 = class113.stringCp1252NullTerminatedByteSize(var2); - if (var7 % 8 != 0) { - var7 += 8 - var7 % 8; - } - - Buffer var24 = new Buffer(var7); - var24.writeStringCp1252NullTerminated(var2); - var24.offset = var7; - var24.xteaEncryptAll(var6); - Buffer var18 = new Buffer(var5.offset + var4.offset + var24.offset + 5); - var18.writeByte(2); - var18.writeByte(var4.offset); - var18.writeBytes(var4.array, 0, var4.offset); - var18.writeByte(var5.offset); - var18.writeBytes(var5.array, 0, var5.offset); - var18.writeShort(var24.offset); - var18.writeBytes(var24.array, 0, var24.offset); - byte[] var11 = var18.array; - String var20 = WallDecoration.method4580(var11, 0, var11.length); - String var12 = var20; - - try { - URL var13 = new URL(HitSplatDefinition.method3168("services", false) + "m=accountappeal/login.ws"); - URLConnection var14 = var13.openConnection(); - var14.setDoInput(true); - var14.setDoOutput(true); - var14.setConnectTimeout(5000); - OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); - var15.write("data2=" + Language.method5476(var12) + "&dest=" + Language.method5476("passwordchoice.ws")); - var15.flush(); - InputStream var16 = var14.getInputStream(); - var18 = new Buffer(new byte[1000]); - - do { - int var17 = var16.read(var18.array, var18.offset, 1000 - var18.offset); - if (var17 == -1) { - var15.close(); - var16.close(); - String var21 = new String(var18.array); - if (var21.startsWith("OFFLINE")) { - return 4; - } else if (var21.startsWith("WRONG")) { - return 7; - } else if (var21.startsWith("RELOAD")) { - return 3; - } else if (var21.startsWith("Not permitted for social network accounts.")) { - return 6; - } else { - var18.xteaDecryptAll(var6); - - while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) { - --var18.offset; - } - - var21 = new String(var18.array, 0, var18.offset); - if (GrandExchangeOffer.method5406(var21)) { - LoginScreenAnimation.openURL(var21, true, false); - return 2; - } else { - return 5; - } - } - } - - var18.offset += var17; - } while(var18.offset < 1000); - - return 5; - } catch (Throwable var22) { - var22.printStackTrace(); - return 5; + return (var0 & 65408) + var1; // L: 575 } } + + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "(Lkd;Ljava/lang/String;B)V", + garbageValue = "0" + ) + static void method2460(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1977 + Client.archiveLoaders.add(var2); // L: 1978 + Client.field745 += var2.groupCount; // L: 1979 + } // L: 1980 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "14" + ) + static final void method2462() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11751 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11752 + var1.clearIsFriend(); // L: 11753 + } + + Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 11756 + + while (var2.hasNext()) { + Message var3 = (Message)var2.next(); // L: 11757 + var3.clearIsFromFriend(); // L: 11759 + } + + if (AbstractArchive.friendsChat != null) { // L: 11763 + AbstractArchive.friendsChat.clearFriends(); // L: 11764 + } + + } // L: 11766 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 60856a939e..99bc3e203f 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,34 +1,59 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("da") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("l") + @ObfuscatedName("bm") + @ObfuscatedGetter( + intValue = -1416799975 + ) + static int field1326; + @ObfuscatedName("i") @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmi;Lmi;I)I", - garbageValue = "-902931743" + descriptor = "(Lmt;Lmt;I)I", + garbageValue = "-1547709141" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + 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 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IS)Ljf;", + garbageValue = "-28609" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 199 + int var2 = var0 & 65535; // L: 200 + if (WorldMapSection1.Widget_interfaceComponents[var1] == null || WorldMapSection1.Widget_interfaceComponents[var1][var2] == null) { // L: 201 + boolean var3 = class174.loadInterface(var1); // L: 202 + if (!var3) { // L: 203 + return null; + } + } + + return WorldMapSection1.Widget_interfaceComponents[var1][var2]; // L: 205 } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index b8c705d282..6cae57329e 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,395 +7,335 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mx") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("fb") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1803519821 - ) - @Export("js5Port") - static int js5Port; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -790590989 + intValue = -2120232859 ) @Export("capacity") final int capacity; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1994155047 + intValue = -1042330893 ) @Export("size") int size; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Llu;" + descriptor = "[Lla;" ) @Export("array") User[] array; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("comparator") Comparator comparator; UserList(int var1) { - 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); - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Llu;", - garbageValue = "396333118" + descriptor = "(I)Lla;", + garbageValue = "-450730044" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)[Llu;", - garbageValue = "1129798936" + descriptor = "(IB)[Lla;", + garbageValue = "91" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-492796417" + garbageValue = "63968071" ) @Export("clear") public void clear() { - this.size = 0; - Arrays.fill(this.array, (Object)null); - this.usernamesMap.clear(); - this.previousUsernamesMap.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 - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1616091928" + garbageValue = "-1005728784" ) @Export("getSize") public int getSize() { - return this.size; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1322642519" - ) - @Export("isFull") - public boolean isFull() { - return this.size == this.capacity; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Z", - garbageValue = "70733462" - ) - @Export("contains") - public boolean contains(Username var1) { - if (!var1.hasCleanName()) { - return false; - } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Llu;", - garbageValue = "-355619052" - ) - @Export("getByUsername") - public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - return var2 != null ? var2 : this.getByPreviousUsername(var1); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Llu;", - garbageValue = "-1582886561" - ) - @Export("getByCurrentUsername") - User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(Lpm;B)Llu;", - garbageValue = "9" - ) - @Export("getByPreviousUsername") - User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Z", - garbageValue = "-1508936158" - ) - @Export("removeByUsername") - public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - if (var2 == null) { - return false; - } else { - this.remove(var2); - return true; - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Llu;B)V", - garbageValue = "85" - ) - @Export("remove") - final void remove(User var1) { - int var2 = this.indexOf(var1); - if (var2 != -1) { - this.arrayRemove(var2); - this.mapRemove(var1); - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lpm;I)Llu;", - garbageValue = "-1795498440" - ) - @Export("addLastNoPreviousUsername") - User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); + return this.size; // L: 31 } @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lpm;Lpm;I)Llu;", - garbageValue = "-769828477" + descriptor = "(B)Z", + garbageValue = "4" ) - @Export("addLast") - User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { - throw new IllegalStateException(); + @Export("isFull") + public boolean isFull() { + return this.size == this.capacity; // L: 35 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Z", + garbageValue = "1083581266" + ) + @Export("contains") + public boolean contains(Username var1) { + if (!var1.hasCleanName()) { // L: 39 + return false; } else { - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); // L: 40 41 } } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)Llu;", - garbageValue = "-2045496453" + descriptor = "(Lpb;I)Lla;", + garbageValue = "-1249028509" + ) + @Export("getByUsername") + public User getByUsername(Username var1) { + User var2 = this.getByCurrentUsername(var1); // L: 45 + return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Lla;", + garbageValue = "1290274036" + ) + @Export("getByCurrentUsername") + User getByCurrentUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lpb;B)Lla;", + garbageValue = "1" + ) + @Export("getByPreviousUsername") + User getByPreviousUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lpb;B)Z", + garbageValue = "1" + ) + @Export("removeByUsername") + public final boolean removeByUsername(Username var1) { + User var2 = this.getByCurrentUsername(var1); // L: 61 + if (var2 == null) { // L: 62 + return false; + } else { + this.remove(var2); // L: 63 + return true; // L: 64 + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lla;I)V", + garbageValue = "-1555884949" + ) + @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 + } + } // L: 72 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Lla;", + garbageValue = "-947812103" + ) + @Export("addLastNoPreviousUsername") + User addLastNoPreviousUsername(Username var1) { + return this.addLast(var1, (Username)null); // L: 75 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lpb;Lpb;I)Lla;", + garbageValue = "-1127655179" + ) + @Export("addLast") + User addLast(Username var1, Username var2) { + if (this.getByCurrentUsername(var1) != null) { // L: 79 + throw new IllegalStateException(); + } else { + 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 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)Lla;", + garbageValue = "1290152106" ) @Export("get") public final User get(int var1) { - if (var1 >= 0 && var1 < this.size) { - return this.array[var1]; + if (var1 >= 0 && var1 < this.size) { // L: 88 + return this.array[var1]; // L: 89 } else { throw new ArrayIndexOutOfBoundsException(var1); } } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2014826236" + descriptor = "(B)V", + garbageValue = "-17" ) @Export("sort") public final void sort() { - if (this.comparator == null) { - Arrays.sort(this.array, 0, this.size); + if (this.comparator == null) { // L: 93 + Arrays.sort(this.array, 0, this.size); // L: 94 } else { - Arrays.sort(this.array, 0, this.size, this.comparator); + Arrays.sort(this.array, 0, this.size, this.comparator); // L: 97 } - } + } // L: 99 - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llu;Lpm;Lpm;B)V", - garbageValue = "95" + descriptor = "(Lla;Lpb;Lpb;B)V", + garbageValue = "96" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); - var1.set(var2, var3); - this.mapPut(var1); - } + this.mapRemove(var1); // L: 102 + var1.set(var2, var3); // L: 103 + this.mapPut(var1); // L: 104 + } // L: 105 - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Llu;I)I", - garbageValue = "-453240274" + descriptor = "(Lla;B)I", + garbageValue = "0" ) @Export("indexOf") final int indexOf(User var1) { - for (int var2 = 0; var2 < this.size; ++var2) { - if (this.array[var2] == var1) { + for (int var2 = 0; var2 < this.size; ++var2) { // L: 108 + if (this.array[var2] == var1) { // L: 109 return var2; } } - return -1; + return -1; // L: 111 } @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Llu;I)V", - garbageValue = "-895000135" + descriptor = "(Lla;B)V", + garbageValue = "49" ) @Export("mapRemove") final void mapRemove(User var1) { - if (this.usernamesMap.remove(var1.username) == null) { + if (this.usernamesMap.remove(var1.username) == null) { // L: 115 throw new IllegalStateException(); } else { if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); + this.previousUsernamesMap.remove(var1.previousUsername); // L: 116 } } - } + } // L: 117 - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Llu;B)V", - garbageValue = "8" + descriptor = "(Lla;B)V", + garbageValue = "12" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; - } + this.array[++this.size - 1] = var1; // L: 120 + } // L: 121 - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Llu;I)V", - garbageValue = "1014932852" + descriptor = "(Lla;I)V", + garbageValue = "-1447603702" ) @Export("mapPut") final void mapPut(User var1) { - 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; + 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 } } - } + } // L: 131 - @ObfuscatedName("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-27" + descriptor = "(II)V", + garbageValue = "-1966671685" ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; - if (var1 < this.size) { - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - 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 } - } + } // L: 138 - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-78" + garbageValue = "64" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; - } + this.comparator = null; // L: 144 + } // L: 145 - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-166058218" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "-61" ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { - this.comparator = var1; - } else if (this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).addComparator(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 } - } - - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "586592050" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - class21.client.method474(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - CollisionMap.method3418(0); - Client.field516 = 0; - Client.field680 = 0; - Client.timer.method5905(var0); - if (var0 != 20) { - class7.method61(false); - } - } - - if (var0 != 20 && var0 != 40 && PendingSpawn.field1101 != null) { - PendingSpawn.field1101.close(); - PendingSpawn.field1101 = null; - } - - if (Client.gameState == 25) { - Client.field534 = 0; - Client.field764 = 0; - Client.field544 = 1; - Client.field545 = 0; - Client.field546 = 1; - } - - int var1; - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - var1 = Client.gameState == 11 ? 4 : 0; - TextureProvider.method4433(UserComparator8.archive10, class176.archive8, true, var1); - } else if (var0 == 11) { - TextureProvider.method4433(UserComparator8.archive10, class176.archive8, false, 4); - } else { - class7.method63(); - } - } else { - var1 = class12.method159() ? 0 : 12; - TextureProvider.method4433(UserComparator8.archive10, class176.archive8, true, var1); - } - - Client.gameState = var0; - } - } + } // L: 154 } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index d7141fa4c6..40cc677ee4 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,96 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pm") +@ObfuscatedName("pb") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("name") String name; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lny;)V" + descriptor = "(Ljava/lang/String;Lni;)V" ) public Username(String var1, LoginType var2) { - this.name = var1; - this.cleanName = Varcs.method2322(var1, var2); - } + this.name = var1; // L: 16 + this.cleanName = GameEngine.method585(var1, var2); // L: 17 + } // L: 18 public Username(String var1) { - this.name = var1; - this.cleanName = Varcs.method2322(var1, LoginType.oldscape); - } + this.name = var1; // L: 11 + this.cleanName = GameEngine.method585(var1, LoginType.oldscape); // L: 12 + } // L: 13 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "58" + garbageValue = "98" ) @Export("getName") public String getName() { - return this.name; + return this.name; // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1341977890" + garbageValue = "-74292372" ) - public String method7459() { - return this.cleanName; + public String method7579() { + return this.cleanName; // L: 25 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "460895398" + descriptor = "(B)Z", + garbageValue = "89" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; + return this.cleanName != null; // L: 29 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpm;I)I", - garbageValue = "1178953694" + descriptor = "(Lpb;B)I", + garbageValue = "6" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { - return var1.cleanName == null ? 0 : 1; + if (this.cleanName == null) { // L: 53 + return var1.cleanName == null ? 0 : 1; // L: 54 55 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 57 58 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { - Username var2 = (Username)var1; + if (var1 instanceof Username) { // L: 33 + Username var2 = (Username)var1; // L: 34 if (this.cleanName == null) { - return var2.cleanName == null; - } else if (var2.cleanName == null) { + return var2.cleanName == null; // L: 35 + } else if (var2.cleanName == null) { // L: 36 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 37 38 } } else { - return false; + return false; // L: 40 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 44 45 } public String toString() { - return this.getName(); + return this.getName(); // L: 49 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); + return this.compareToTyped((Username)var1); // L: 62 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index cf6f98fa93..21178e46b4 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lc") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kz") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(B)Lpm;", - garbageValue = "-28" + descriptor = "(I)Lpb;", + garbageValue = "-1245448697" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index ca3b3252fe..38e5d34f61 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -4,136 +4,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fy") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("q") + static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("k") - static final int[] field1784; - @ObfuscatedName("do") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("f") + @ObfuscatedName("g") + static final int[] field1780; + @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = 1254012853 + intValue = -71897969 + ) + static int field1775; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 207149791 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -590597255 + intValue = 348615607 ) @Export("startBit") public int startBit; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1105394607 + intValue = -1999695007 ) @Export("endBit") public int endBit; static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1784 = new int[32]; - int var0 = 2; + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + field1780 = new int[32]; // L: 15 + int var0 = 2; // L: 18 - for (int var1 = 0; var1 < 32; ++var1) { - field1784[var1] = var0 - 1; - var0 += var0; + for (int var1 = 0; var1 < 32; ++var1) { // L: 19 + field1780[var1] = var0 - 1; // L: 20 + var0 += var0; // L: 21 } - } + } // L: 23 VarbitComposition() { - } + } // L: 25 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-123239897" + descriptor = "(Lop;S)V", + garbageValue = "3911" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 43 + if (var2 == 0) { // L: 44 + return; // L: 47 } - this.decodeNext(var1, var2); - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1018512127" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.baseVar = var1.readUnsignedShort(); - this.startBit = var1.readUnsignedByte(); - this.endBit = var1.readUnsignedByte(); - } - - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;II)Liq;", - garbageValue = "-1817307583" - ) - static MusicPatch method3103(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IB)Lfb;", - garbageValue = "4" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - 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); - return var1; + this.decodeNext(var1, var2); // L: 45 } } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lkl;IIB)Z", - garbageValue = "41" + descriptor = "(Lop;II)V", + garbageValue = "-1096806966" ) - public static boolean method3102(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 50 + this.baseVar = var1.readUnsignedShort(); + this.startBit = var1.readUnsignedByte(); + this.endBit = var1.readUnsignedByte(); + } + + } // L: 56 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)[Ljb;", + garbageValue = "51" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3652, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3650, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.field3649}; // L: 22 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnf;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1356427947" + ) + static String method3205(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 51 + return var2; } else { - class398.SpriteBuffer_decode(var3); - return true; + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 52 + return var3 == null ? var2 : (String)var3.obj; // L: 53 54 } } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 145cc2ea07..c12cde7749 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,58 +3,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("eq") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("VarcInt_cached") - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("f") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("ar") + protected static String field1645; + @ObfuscatedName("s") @Export("persist") public boolean persist; static { - VarcInt_cached = new EvictingDualNodeHashTable(64); + VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - VarcInt() { - this.persist = false; + public VarcInt() { + this.persist = false; // L: 12 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-2028367777" + descriptor = "(Lop;I)V", + garbageValue = "-1726990903" ) - void method2924(Buffer var1) { + public void method3026(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 20 + if (var2 == 0) { // L: 21 + return; // L: 24 } - this.method2925(var1, var2); + this.method3027(var1, var2); // L: 22 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "657554890" + descriptor = "(Lop;II)V", + garbageValue = "-1102307189" ) - void method2925(Buffer var1, int var2) { - if (var2 == 2) { - this.persist = true; + void method3027(Buffer var1, int var2) { + if (var2 == 2) { // L: 27 + this.persist = true; // L: 28 } - } + } // L: 31 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2018767281" + ) + static final void method3033() { + Client.field679 = Client.cycleCntr; // L: 11790 + } // L: 11791 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 6905b4ba72..f95c9d474b 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -1,4 +1,6 @@ import java.io.EOFException; +import java.io.File; +import java.io.RandomAccessFile; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -9,460 +11,382 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("ch") @Implements("Varcs") public class Varcs { - @ObfuscatedName("sj") - @ObfuscatedGetter( - intValue = 1235978781 + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "Lhr;" ) - static int field1272; - @ObfuscatedName("fo") - static String field1264; - @ObfuscatedName("f") + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("or") + @ObfuscatedGetter( + intValue = -908008497 + ) + static int field1263; + @ObfuscatedName("s") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("map") Map map; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("strings") String[] strings; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 8254502909318544887L + longValue = 7843770770834716127L ) - long field1268; + long field1261; Varcs() { - this.unwrittenChanges = false; - int var1 = RouteStrategy.archive2.getGroupFileCount(19); - this.map = new HashMap(); - this.intsPersistence = new boolean[var1]; + this.unwrittenChanges = false; // L: 22 + int var1 = class1.archive2.getGroupFileCount(19); // L: 26 + this.map = new HashMap(); // L: 27 + this.intsPersistence = new boolean[var1]; // L: 28 int var2; - for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = ClanChannel.method2747(var2); - this.intsPersistence[var2] = var3.persist; + for (var2 = 0; var2 < var1; ++var2) { // L: 29 + VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 32 + VarcInt var3; + if (var4 != null) { // L: 33 + var3 = var4; // L: 34 + } else { + byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 37 + var4 = new VarcInt(); // L: 38 + if (var5 != null) { + var4.method3026(new Buffer(var5)); // L: 39 + } + + VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 40 + var3 = var4; // L: 41 + } + + this.intsPersistence[var2] = var3.persist; // L: 44 } - var2 = 0; - if (RouteStrategy.archive2.method5180(15)) { - var2 = RouteStrategy.archive2.getGroupFileCount(15); + var2 = 0; // L: 46 + if (class1.archive2.method5270(15)) { // L: 47 + var2 = class1.archive2.getGroupFileCount(15); // L: 48 } - this.strings = new String[var2]; - this.read(); - } + this.strings = new String[var2]; // L: 50 + this.read(); // L: 51 + } // L: 52 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1268577977" + descriptor = "(IIB)V", + garbageValue = "118" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); + this.map.put(var1, var2); // L: 55 if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; + this.unwrittenChanges = true; // L: 56 } - } + } // L: 57 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-802312399" + garbageValue = "1775073178" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); - return var2 instanceof Integer ? (Integer)var2 : -1; + Object var2 = this.map.get(var1); // L: 60 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 61 62 64 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-376908276" + garbageValue = "1662383192" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "2025584250" - ) - @Export("getString") - String getString(int var1) { - Object var2 = this.map.get(var1); - return var2 instanceof String ? (String)var2 : ""; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "30677597" - ) - @Export("setStringOld") - void setStringOld(int var1, String var2) { - this.strings[var1] = var2; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-959424715" - ) - @Export("getStringOld") - String getStringOld(int var1) { - return this.strings[var1]; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1851906342" - ) - @Export("clearTransient") - void clearTransient() { - int var1; - for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { - if (!this.intsPersistence[var1]) { - this.map.remove(var1); - } - } - - for (var1 = 0; var1 < this.strings.length; ++var1) { - this.strings[var1] = null; - } - - } + this.map.put(var1, var2); // L: 68 + } // L: 69 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZI)Lnj;", - garbageValue = "3487029" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "1" ) - @Export("getPreferencesFile") - AccessFile getPreferencesFile(boolean var1) { - return World.getPreferencesFile("2", class392.field4267.name, var1); + @Export("getString") + String getString(int var1) { + Object var2 = this.map.get(var1); // L: 72 + return var2 instanceof String ? (String)var2 : ""; // L: 73 74 76 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "114" + ) + @Export("setStringOld") + void setStringOld(int var1, String var2) { + this.strings[var1] = var2; // L: 80 + } // L: 81 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-2025393561" + ) + @Export("getStringOld") + String getStringOld(int var1) { + return this.strings[var1]; // L: 84 } @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "34" + ) + @Export("clearTransient") + void clearTransient() { + int var1; + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 88 + if (!this.intsPersistence[var1]) { // L: 89 + this.map.remove(var1); // L: 90 + } + } + + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 93 + this.strings[var1] = null; // L: 94 + } + + } // L: 96 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ZI)Lnv;", + garbageValue = "679727155" + ) + @Export("getPreferencesFile") + AccessFile getPreferencesFile(boolean var1) { + return DevicePcmPlayerProvider.getPreferencesFile("2", RouteStrategy.field1986.name, var1); // L: 99 + } + + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1764400814" + garbageValue = "-847294066" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); + AccessFile var1 = this.getPreferencesFile(true); // L: 103 try { - int var2 = 3; - int var3 = 0; - Iterator var4 = this.map.entrySet().iterator(); + int var2 = 3; // L: 105 + int var3 = 0; // L: 106 + Iterator var4 = this.map.entrySet().iterator(); // L: 107 while (var4.hasNext()) { - Entry var5 = (Entry)var4.next(); - int var6 = (Integer)var5.getKey(); - if (this.intsPersistence[var6]) { - Object var7 = var5.getValue(); - var2 += 3; - if (var7 instanceof Integer) { + Entry var5 = (Entry)var4.next(); // L: 108 + int var6 = (Integer)var5.getKey(); // L: 110 + if (this.intsPersistence[var6]) { // L: 111 + Object var7 = var5.getValue(); // L: 112 + var2 += 3; // L: 113 + if (var7 instanceof Integer) { // L: 114 var2 += 4; - } else if (var7 instanceof String) { - var2 += class113.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { // L: 115 + var2 += Client.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; + ++var3; // L: 116 } } - Buffer var28 = new Buffer(var2); - var28.writeByte(2); - var28.writeShort(var3); - Iterator var29 = this.map.entrySet().iterator(); + Buffer var26 = new Buffer(var2); // L: 120 + var26.writeByte(2); // L: 121 + var26.writeShort(var3); // L: 122 + Iterator var27 = this.map.entrySet().iterator(); // L: 123 - label147: - while (true) { - Entry var17; - int var18; - do { - if (!var29.hasNext()) { - var1.write(var28.array, 0, var28.offset); - break label147; + while (var27.hasNext()) { + Entry var15 = (Entry)var27.next(); // L: 124 + int var16 = (Integer)var15.getKey(); // L: 126 + if (this.intsPersistence[var16]) { // L: 127 + var26.writeShort(var16); // L: 128 + Object var8 = var15.getValue(); // L: 129 + class392 var9 = class392.method6856(var8.getClass()); // L: 130 + var26.writeByte(var9.field4273); // L: 131 + Class var11 = var8.getClass(); // L: 134 + class392 var12 = class392.method6856(var11); // L: 136 + if (var12 == null) { // L: 137 + throw new IllegalArgumentException(); } - var17 = (Entry)var29.next(); - var18 = (Integer)var17.getKey(); - } while(!this.intsPersistence[var18]); - - var28.writeShort(var18); - Object var8 = var17.getValue(); - Class var10 = var8.getClass(); - class392[] var11 = new class392[]{class392.field4266, class392.field4264, class392.field4273}; - class392[] var12 = var11; - int var13 = 0; - - class392 var9; - while (true) { - if (var13 >= var12.length) { - var9 = null; - break; - } - - class392 var14 = var12[var13]; - if (var10 == var14.field4265) { - var9 = var14; - break; - } - - ++var13; + class388 var10 = var12.field4275; // L: 138 + var10.vmethod6878(var8, var26); // L: 141 } - - var28.writeByte(var9.field4260); - class392.method6797(var8, var28); } - } catch (Exception var26) { + + var1.write(var26.array, 0, var26.offset); // L: 146 + } catch (Exception var24) { // L: 148 } finally { try { - var1.close(); - } catch (Exception var25) { + var1.close(); // L: 151 + } catch (Exception var23) { // L: 153 } } - this.unwrittenChanges = false; - this.field1268 = UserComparator4.method2406(); - } + this.unwrittenChanges = false; // L: 155 + this.field1261 = class111.method2516(); // L: 156 + } // L: 157 - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" + descriptor = "(I)V", + garbageValue = "1233938263" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); + AccessFile var1 = this.getPreferencesFile(false); // L: 160 - try { - byte[] var2 = new byte[(int)var1.length()]; - - int var4; - 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); - if (var15.array.length - var15.offset < 1) { - return; - } - - int var16 = var15.readUnsignedByte(); - if (var16 < 0 || var16 > 2) { - return; - } - - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class392[] var10 = new class392[]{class392.field4266, class392.field4264, class392.field4273}; - class392 var11 = (class392)class128.findEnumerated(var10, var9); - Object var12 = var11.method6800(var15); - if (this.intsPersistence[var8]) { - this.map.put(var8, var12); - } - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var15.readUnsignedShort(); - - for (var8 = 0; var8 < var7; ++var8) { - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - } - } - } catch (Exception var26) { - } finally { + label212: { try { - var1.close(); - } catch (Exception var25) { + byte[] var2 = new byte[(int)var1.length()]; // L: 162 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 163 164 167 + var4 = var1.read(var2, var3, var2.length - var3); // L: 165 + if (var4 == -1) { // L: 166 + throw new EOFException(); + } + } + + Buffer var14 = new Buffer(var2); // L: 169 + if (var14.array.length - var14.offset >= 1) { // L: 170 + int var15 = var14.readUnsignedByte(); // L: 171 + if (var15 < 0 || var15 > 2) { // L: 172 + return; + } + + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 173 + var16 = var14.readUnsignedShort(); // L: 174 + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label212; + } + + var8 = var14.readUnsignedShort(); // L: 176 + var9 = var14.readUnsignedByte(); // L: 177 + class392 var10 = (class392)UserComparator4.findEnumerated(class392.method6855(), var9); // L: 178 + Object var11 = var10.method6858(var14); // L: 179 + if (this.intsPersistence[var8]) { // L: 180 + this.map.put(var8, var11); // L: 181 + } + + ++var7; // L: 175 + } + } else { + var16 = var14.readUnsignedShort(); // L: 186 + + for (var7 = 0; var7 < var16; ++var7) { // L: 187 + var8 = var14.readUnsignedShort(); // L: 188 + var9 = var14.readInt(); // L: 189 + if (this.intsPersistence[var8]) { // L: 190 + this.map.put(var8, var9); // L: 191 + } + } + + var7 = var14.readUnsignedShort(); // L: 194 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label212; + } + + var14.readUnsignedShort(); // L: 196 + var14.readStringCp1252NullTerminated(); // L: 197 + ++var8; // L: 195 + } + } + } + } catch (Exception var25) { // L: 201 + break label212; + } finally { + try { + var1.close(); + } catch (Exception var24) { + } + } + return; } this.unwrittenChanges = false; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-734766189" + garbageValue = "-153672255" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1268 < UserComparator4.method2406() - 60000L) { + if (this.unwrittenChanges && this.field1261 < class111.method2516() - 60000L) { // L: 212 this.write(); } - } + } // L: 215 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "14" + descriptor = "(I)Z", + garbageValue = "675810598" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; + return this.unwrittenChanges; // L: 218 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lny;I)Ljava/lang/String;", - garbageValue = "1855496954" + descriptor = "(Ljava/io/File;ZB)Z", + garbageValue = "16" ) - public static String method2322(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; - - int var3; - boolean var4; - char var5; - for (var3 = var0.length(); var2 < var3; ++var2) { - var5 = var0.charAt(var2); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } + static boolean method2359(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 204 + int var3 = var2.read(); // L: 205 + var2.seek(0L); // L: 206 + var2.write(var3); // L: 207 + var2.seek(0L); // L: 208 + var2.close(); // L: 209 + if (var1) { // L: 210 + var0.delete(); } - while (var3 > var2) { - var5 = var0.charAt(var3 - 1); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - - --var3; - } - - int var14 = var3 - var2; - if (var14 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4229) { - case 6: - var6 = 20; - break; - default: - var6 = 12; - } - } - - if (var14 <= var6) { - StringBuilder var12 = new StringBuilder(var14); - - for (int var15 = var2; var15 < var3; ++var15) { - char var7 = var0.charAt(var15); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (KeyHandler.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var9 = class383.field4231; - int var10 = 0; - - label103: - while (true) { - char var11; - if (var10 >= var9.length) { - var9 = class383.field4232; - - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - if (var11 == var7) { - var8 = true; - break label103; - } - } - - var8 = false; - break; - } - - var11 = var9[var10]; - if (var7 == var11) { - var8 = true; - break; - } - - ++var10; - } - } - - if (var8) { - char var13 = class280.method5139(var7); - if (var13 != 0) { - var12.append(var13); - } - } - } - - if (var12.length() == 0) { - return null; - } - - return var12.toString(); - } - } - - return null; + return true; // L: 211 + } catch (Exception var4) { // L: 213 + return false; // L: 214 } } - @ObfuscatedName("l") + @ObfuscatedName("ls") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "70881375" + descriptor = "(Ljf;B)Z", + garbageValue = "-63" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = AttackOption.method2263(var0); - int var2 = var1.baseVar; - int var3 = var1.startBit; - int var4 = var1.endBit; - int var5 = Varps.Varps_masks[var4 - var3]; - return Varps.Varps_main[var2] >> var3 & var5; + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11900 } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 06741cffcf..2cb4f53371 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,152 +4,119 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("ef") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("VarpDefinition_archive") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1515261229 + intValue = -426793897 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("ij") - @ObfuscatedGetter( - intValue = 1386974475 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("mg") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "[Loe;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("j") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 29710685 + intValue = 830934537 ) @Export("type") public int type; static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); + VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } VarpDefinition() { - this.type = 0; - } + this.type = 0; // L: 13 + } // L: 15 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "1" + descriptor = "(Lop;B)V", + garbageValue = "19" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 34 + if (var2 == 0) { // L: 35 + return; // L: 38 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 36 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "790486090" + descriptor = "(Lop;II)V", + garbageValue = "-2104841656" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { + if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } - } + } // L: 43 - @ObfuscatedName("j") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(Lot;IIIIIII)V", - garbageValue = "-280923816" + descriptor = "(I)V", + garbageValue = "-1448622036" ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - if (var1 == 0) { - int[] var14 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = class20.method303(var11 + 45365, var12 + 91923, 4) - 128 + (class20.method303(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (class20.method303(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var14[var3] = -var13 * 8; + static final void method3004() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 5108 5109 5116 + if (var0.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane && !var0.isFinished) { // L: 5110 + if (Client.cycle >= var0.cycleStart) { // L: 5111 + var0.advance(Client.field531); // L: 5112 + if (var0.isFinished) { + var0.remove(); // L: 5113 } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + GameBuild.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 5114 } - break; - } - - if (var7 == 1) { - int var8 = var0.readUnsignedByte(); - if (var8 == 1) { - var8 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; - } - break; - } - - if (var7 <= 49) { - Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); - class14.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); - GrandExchangeEvent.field3760[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); - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); } + } else { + var0.remove(); } } - } + } // L: 5118 + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1840015615" + ) + static final void method3003(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 11857 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2809()) { // L: 11858 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11859 + PacketWriter var4 = Client.packetWriter; // L: 11860 + PacketBufferNode var5 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2765, var4.isaacCipher); // L: 11861 + var5.packetBuffer.writeByte(4 + Client.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 11862 + var5.packetBuffer.writeByte(var0); // L: 11863 + var5.packetBuffer.writeShort(var1); // L: 11864 + var5.packetBuffer.writeBoolean(var2); // L: 11865 + var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 11866 + var4.addNode(var5); // L: 11867 + } + } + } // L: 11868 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 61d5511bfe..2924afdf5e 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -3,39 +3,75 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("iq") @Implements("Varps") public class Varps { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("x") + public static short[] field3013; static { - Varps_masks = new int[32]; - int var0 = 2; + Varps_masks = new int[32]; // L: 6 + int var0 = 2; // L: 9 - for (int var1 = 0; var1 < 32; ++var1) { - Varps_masks[var1] = var0 - 1; - var0 += var0; + for (int var1 = 0; var1 < 32; ++var1) { // L: 10 + Varps_masks[var1] = var0 - 1; // L: 11 + var0 += var0; // L: 12 } - Varps_temp = new int[4000]; - Varps_main = new int[4000]; + Varps_temp = new int[4000]; // L: 16 + Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "4" + descriptor = "(II)Z", + garbageValue = "-1911470841" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + public static boolean method5007(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field118[var0] : false; // L: 219 220 } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljf;I[B[BS)V", + garbageValue = "20257" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3180 == null) { // L: 975 + if (var2 == null) { // L: 976 + return; // L: 982 + } + + var0.field3180 = new byte[11][]; // L: 977 + var0.field3105 = new byte[11][]; // L: 978 + var0.field3128 = new int[11]; // L: 979 + var0.field3129 = new int[11]; // L: 980 + } + + var0.field3180[var1] = var2; // L: 984 + if (var2 != null) { + var0.field3125 = true; // L: 985 + } else { + var0.field3125 = false; // L: 987 + + for (int var4 = 0; var4 < var0.field3180.length; ++var4) { // L: 988 + if (var0.field3180[var4] != null) { // L: 989 + var0.field3125 = true; // L: 990 + break; + } + } + } + + var0.field3105[var1] = var3; // L: 995 + } // L: 996 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index e0e10193eb..da1a3f7272 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,65 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hp") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("kt") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1805668533 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1283611121 + intValue = -755097021 ) @Export("x") int x; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -812646739 + intValue = -2006486583 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1799999959 + intValue = -1176524853 ) @Export("z") int z; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 261367591 + intValue = 836304425 ) @Export("magnitude") int magnitude; VertexNormal() { - } + } // L: 9 @ObfuscatedSignature( - descriptor = "(Lha;)V" + descriptor = "(Lhp;)V" ) VertexNormal(VertexNormal var1) { - this.x = var1.x; - this.y = var1.y; - this.z = var1.z; - this.magnitude = var1.magnitude; - } + 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 - @ObfuscatedName("m") + @ObfuscatedName("gf") @ObfuscatedSignature( - descriptor = "(ILkl;IIIZB)V", - garbageValue = "84" + descriptor = "(I)V", + garbageValue = "1811785448" ) - public static void method4560(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = var1; - Skills.musicTrackGroupId = var2; - class137.musicTrackFileId = var3; - class247.musicTrackVolume = var4; - class247.musicTrackBoolean = var5; - class247.pcmSampleLength = var0; - } + static void method4623() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 5045 + class132.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 5046 + } + + } // L: 5048 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index a16f12ab22..d994d5c57d 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,99 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fg") @Implements("VerticalAlignment") public enum VerticalAlignment implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfg;" ) - field1747(0, 0), - @ObfuscatedName("q") + field1743(2, 0), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfg;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(1, 1), - @ObfuscatedName("f") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfg;" ) - field1748(2, 2); + field1744(1, 2); - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 781390269 + intValue = 1028915727 ) @Export("value") public final int value; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -632876021 + intValue = 1836218951 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 23 } - @ObfuscatedName("t") + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "(Lbc;Lbc;IZI)I", - garbageValue = "121439136" + descriptor = "(B)V", + garbageValue = "-29" ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } + static final void method3159() { + int var0 = Players.Players_count; // L: 4244 + int[] var1 = Players.Players_indices; // L: 4245 - if (var5 == -1) { - var5 = 2001; - } + for (int var2 = 0; var2 < var0; ++var2) { // L: 4246 + Player var3 = Client.players[var1[var2]]; // L: 4247 + if (var3 != null) { // L: 4248 + class135.updateActorSequence(var3, 1); // L: 4249 } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method1594() ? (var1.method1594() ? 0 : 1) : (var1.method1594() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1592() ? (var1.method1592() ? 0 : 1) : (var1.method1592() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; } - } + + } // L: 4252 + + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-375267443" + ) + static void method3157() { + if (Client.renderSelf) { // L: 5039 + class132.addPlayerToScene(HealthBarDefinition.localPlayer, false); // L: 5040 + } + + } // L: 5042 } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index f91cf1c897..24d7eebc9c 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,149 +3,95 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hq") +@ObfuscatedName("hk") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -953546055 + intValue = 1767898875 ) @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 649288631 + intValue = -1574858815 ) @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1423122717 + intValue = -1627779879 ) - static int field2585; - @ObfuscatedName("e") + static int field2582; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 170270171 + intValue = 388017149 ) static int field2579; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1898268003 + intValue = -1496218799 ) - static int field2580; - @ObfuscatedName("v") + static int field2584; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1146683373 + intValue = -1501353273 + ) + static int field2590; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1561495595 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive19") - static Archive archive19; static { - ViewportMouse_isInViewport = false; - ViewportMouse_x = 0; - ViewportMouse_y = 0; - ViewportMouse_false0 = false; - ViewportMouse_entityCount = 0; - ViewportMouse_entityTags = new long[1000]; + 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 } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lcy;I)V", - garbageValue = "-1260271458" + descriptor = "(ILbp;ZI)I", + garbageValue = "598393616" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - SoundSystem.runScript(var0, 500000, 475000); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "457176058" - ) - static void method4556() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); - } - } - - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)Ljt;", - garbageValue = "1935657633" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = HealthBarUpdate.getWidget(var0); - if (var1 == -1) { - return var2; + static int method4622(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1087 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1088 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.x; // L: 1089 + return 1; // L: 1090 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1092 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.y; // L: 1093 + return 1; // L: 1094 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1096 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.width; // L: 1097 + return 1; // L: 1098 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1100 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.height; // L: 1101 + return 1; // L: 1102 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1104 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1105 + return 1; // L: 1106 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1108 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.parentId; // L: 1109 + return 1; // L: 1110 } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + return 2; // L: 1112 } } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(Ljt;IIIIIII)V", - garbageValue = "1628744155" - ) - static final void method4559(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field551) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field551 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - class16.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - class16.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - class16.invalidateWidget(var0); - Client.field551 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - class16.invalidateWidget(var0); - } - } - - } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 36e0c35533..74ee2270b8 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("am") +@ObfuscatedName("aj") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("dimensions") int dimensions; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("entries") int entries; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("j") - int[] field346; - @ObfuscatedName("m") - float[][] field345; - @ObfuscatedName("k") + @ObfuscatedName("a") + int[] field331; + @ObfuscatedName("o") + float[][] field328; + @ObfuscatedName("g") @Export("keys") int[] keys; VorbisCodebook() { - VorbisSample.readBits(24); - this.dimensions = VorbisSample.readBits(16); - this.entries = VorbisSample.readBits(24); - this.lengthMap = new int[this.entries]; - boolean var1 = VorbisSample.readBit() != 0; + VorbisSample.readBits(24); // L: 22 + this.dimensions = VorbisSample.readBits(16); // L: 23 + this.entries = VorbisSample.readBits(24); // L: 24 + this.lengthMap = new int[this.entries]; // L: 25 + boolean var1 = VorbisSample.readBit() != 0; // L: 26 int var2; int var3; int var5; - if (var1) { - var2 = 0; + if (var1) { // L: 27 + var2 = 0; // L: 28 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(class194.iLog(this.entries - var2)); + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 + int var4 = VorbisSample.readBits(class65.iLog(this.entries - var2)); // L: 31 - for (var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; + boolean var14 = VorbisSample.readBit() != 0; // L: 37 - for (var3 = 0; var3 < this.entries; ++var3) { - if (var14 && VorbisSample.readBit() == 0) { + for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 + if (var14 && VorbisSample.readBit() == 0) { // L: 39 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 } } } - this.method959(); - 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; + this.method1005(); // L: 43 + var2 = VorbisSample.readBits(4); // L: 44 + if (var2 > 0) { // L: 45 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 + var5 = VorbisSample.readBits(4) + 1; // L: 48 + boolean var6 = VorbisSample.readBit() != 0; // L: 49 int var7; - if (var2 == 1) { + if (var2 == 1) { // L: 51 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; + var7 = this.entries * this.dimensions; // L: 52 } - this.field346 = new int[var7]; + this.field331 = new int[var7]; // L: 53 int var8; - for (var8 = 0; var8 < var7; ++var8) { - this.field346[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 54 + this.field331[var8] = VorbisSample.readBits(var5); } - this.field345 = new float[this.entries][this.dimensions]; + this.field328 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; - if (var2 == 1) { - for (var8 = 0; var8 < this.entries; ++var8) { - var9 = 0.0F; - var10 = 1; + if (var2 == 1) { // L: 56 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 + var9 = 0.0F; // L: 58 + var10 = 1; // L: 59 - for (var11 = 0; var11 < this.dimensions; ++var11) { - int var12 = var8 / var10 % var7; - float var13 = (float)this.field346[var12] * var16 + var15 + var9; - this.field345[var8][var11] = var13; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 + int var12 = var8 / var10 % var7; // L: 61 + float var13 = (float)this.field331[var12] * var16 + var15 + var9; // L: 62 + this.field328[var8][var11] = var13; // L: 63 + if (var6) { // L: 64 var9 = var13; } - var10 *= var7; + var10 *= var7; // L: 65 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { - var9 = 0.0F; - var10 = var8 * this.dimensions; + for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 + var9 = 0.0F; // L: 71 + var10 = var8 * this.dimensions; // L: 72 - for (var11 = 0; var11 < this.dimensions; ++var11) { - float var17 = (float)this.field346[var10] * var16 + var15 + var9; - this.field345[var8][var11] = var17; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 + float var17 = (float)this.field331[var10] * var16 + var15 + var9; // L: 74 + this.field328[var8][var11] = var17; // L: 75 + if (var6) { // L: 76 var9 = var17; } - ++var10; + ++var10; // L: 77 } } } } - } + } // L: 82 - @ObfuscatedName("q") - void method959() { - int[] var1 = new int[this.entries]; - int[] var2 = new int[33]; + @ObfuscatedName("w") + void method1005() { + int[] var1 = new int[this.entries]; // L: 85 + int[] var2 = new int[33]; // L: 87 int var3; int var4; @@ -126,132 +126,109 @@ public class VorbisCodebook { int var7; int var8; int var10; - for (var3 = 0; var3 < this.entries; ++var3) { - var4 = this.lengthMap[var3]; - if (var4 != 0) { - var5 = 1 << 32 - var4; - var6 = var2[var4]; - var1[var3] = var6; + for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 + var4 = this.lengthMap[var3]; // L: 89 + if (var4 != 0) { // L: 90 + var5 = 1 << 32 - var4; // L: 91 + var6 = var2[var4]; // L: 92 + var1[var3] = var6; // L: 93 int var12; - if ((var6 & var5) != 0) { - var7 = var2[var4 - 1]; + if ((var6 & var5) != 0) { // L: 95 + var7 = var2[var4 - 1]; // L: 96 } else { - var7 = var6 | var5; + var7 = var6 | var5; // L: 99 - for (var8 = var4 - 1; var8 >= 1; --var8) { - var12 = var2[var8]; - if (var12 != var6) { + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 + var12 = var2[var8]; // L: 101 + if (var12 != var6) { // L: 102 break; } - var10 = 1 << 32 - var8; - if ((var12 & var10) != 0) { - var2[var8] = var2[var8 - 1]; - break; + var10 = 1 << 32 - var8; // L: 103 + if ((var12 & var10) != 0) { // L: 104 + var2[var8] = var2[var8 - 1]; // L: 105 + break; // L: 106 } - var2[var8] = var12 | var10; + var2[var8] = var12 | var10; // L: 109 } } - var2[var4] = var7; + var2[var4] = var7; // L: 115 - for (var8 = var4 + 1; var8 <= 32; ++var8) { - var12 = var2[var8]; - if (var12 == var6) { + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 + var12 = var2[var8]; // L: 117 + if (var12 == var6) { // L: 118 var2[var8] = var7; } } } } - this.keys = new int[8]; - int var11 = 0; + this.keys = new int[8]; // L: 122 + int var11 = 0; // L: 123 - for (var3 = 0; var3 < this.entries; ++var3) { - var4 = this.lengthMap[var3]; - if (var4 != 0) { - var5 = var1[var3]; - var6 = 0; + for (var3 = 0; var3 < this.entries; ++var3) { // L: 124 + var4 = this.lengthMap[var3]; // L: 125 + if (var4 != 0) { // L: 126 + var5 = var1[var3]; // L: 127 + var6 = 0; // L: 128 - for (var7 = 0; var7 < var4; ++var7) { - var8 = Integer.MIN_VALUE >>> var7; - if ((var5 & var8) != 0) { - if (this.keys[var6] == 0) { + for (var7 = 0; var7 < var4; ++var7) { // L: 129 + var8 = Integer.MIN_VALUE >>> var7; // L: 130 + if ((var5 & var8) != 0) { // L: 131 + if (this.keys[var6] == 0) { // L: 132 this.keys[var6] = var11; } - var6 = this.keys[var6]; + var6 = this.keys[var6]; // L: 133 } else { - ++var6; + ++var6; // L: 136 } - if (var6 >= this.keys.length) { - int[] var9 = new int[this.keys.length * 2]; + if (var6 >= this.keys.length) { // L: 138 + int[] var9 = new int[this.keys.length * 2]; // L: 139 - for (var10 = 0; var10 < this.keys.length; ++var10) { + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 var9[var10] = this.keys[var10]; } - this.keys = var9; + this.keys = var9; // L: 141 } - var8 >>>= 1; + var8 >>>= 1; // L: 143 } - this.keys[var6] = ~var3; - if (var6 >= var11) { + this.keys[var6] = ~var3; // L: 145 + if (var6 >= var11) { // L: 146 var11 = var6 + 1; } } } - } + } // L: 148 - @ObfuscatedName("f") - int method958() { + @ObfuscatedName("s") + int method1006() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } - return ~this.keys[var1]; + return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("j") - float[] method957() { - return this.field345[this.method958()]; + @ObfuscatedName("a") + float[] method1008() { + return this.field328[this.method1006()]; // L: 157 } - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; - - while (true) { - int var4 = var2; - int var5 = var1; - - int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { - if ((var5 & 1) != 0) { - var6 *= var4; - } - - var4 *= var4; - } - - int var3; - if (var5 == 1) { - var3 = var4 * var6; - } else { - var3 = var6; - } - - if (var3 <= var0) { - return var2; - } - - --var2; + int var2; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class317.method5852(var2, var1) > var0; --var2) { // L: 16 17 } + + return var2; // L: 18 } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 7137d863d6..e2c4dd47a3 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,321 +2,321 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ag") +@ObfuscatedName("ac") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("l") - static final int[] field260; - @ObfuscatedName("q") + @ObfuscatedName("i") + static final int[] field247; + @ObfuscatedName("w") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("i") - static int[] field259; + @ObfuscatedName("b") + static int[] field239; + @ObfuscatedName("x") + static int[] field249; @ObfuscatedName("y") - static int[] field254; - @ObfuscatedName("w") - static boolean[] field255; - @ObfuscatedName("f") - int[] field252; - @ObfuscatedName("j") + static boolean[] field250; + @ObfuscatedName("s") + int[] field241; + @ObfuscatedName("a") @Export("multiplier") int multiplier; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("subclassBooks") int[][] subclassBooks; static { - field260 = 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}; + field247 = 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 } VorbisFloor() { - int var1 = VorbisSample.readBits(16); - if (var1 != 1) { - throw new RuntimeException(); + int var1 = VorbisSample.readBits(16); // L: 108 + if (var1 != 1) { // L: 109 + throw new RuntimeException(); // L: 110 } else { - int var2 = VorbisSample.readBits(5); - int var3 = 0; - this.partitionClassList = new int[var2]; + int var2 = VorbisSample.readBits(5); // L: 112 + int var3 = 0; // L: 113 + this.partitionClassList = new int[var2]; // L: 114 int var4; int var5; - for (var4 = 0; var4 < var2; ++var4) { - var5 = VorbisSample.readBits(4); - this.partitionClassList[var4] = var5; - if (var5 >= var3) { + 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 var3 = var5 + 1; } } - this.classDimensions = new int[var3]; - this.classSubClasses = new int[var3]; - this.classMasterbooks = new int[var3]; - this.subclassBooks = new int[var3][]; + 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 int var7; - for (var4 = 0; var4 < var3; ++var4) { - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); - if (var5 != 0) { + 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 this.classMasterbooks[var4] = VorbisSample.readBits(8); } - var5 = 1 << var5; - int[] var9 = new int[var5]; - this.subclassBooks[var4] = var9; + var5 = 1 << var5; // L: 128 + int[] var9 = new int[var5]; // L: 129 + this.subclassBooks[var4] = var9; // L: 130 - for (var7 = 0; var7 < var5; ++var7) { + for (var7 = 0; var7 < var5; ++var7) { // L: 131 var9[var7] = VorbisSample.readBits(8) - 1; } } - this.multiplier = VorbisSample.readBits(2) + 1; - var4 = VorbisSample.readBits(4); - var5 = 2; + this.multiplier = VorbisSample.readBits(2) + 1; // L: 133 + var4 = VorbisSample.readBits(4); // L: 134 + var5 = 2; // L: 135 int var6; - for (var6 = 0; var6 < var2; ++var6) { + for (var6 = 0; var6 < var2; ++var6) { // L: 136 var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field252 = new int[var5]; - this.field252[0] = 0; - this.field252[1] = 1 << var4; - var5 = 2; + this.field241 = new int[var5]; // L: 137 + this.field241[0] = 0; // L: 138 + this.field241[1] = 1 << var4; // L: 139 + var5 = 2; // L: 140 - for (var6 = 0; var6 < var2; ++var6) { - var7 = this.partitionClassList[var6]; + for (var6 = 0; var6 < var2; ++var6) { // L: 141 + var7 = this.partitionClassList[var6]; // L: 142 - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field252[var5++] = VorbisSample.readBits(var4); + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 + this.field241[var5++] = VorbisSample.readBits(var4); } } - if (field259 == null || field259.length < var5) { - field259 = new int[var5]; - field254 = new int[var5]; - field255 = new boolean[var5]; + if (field239 == null || field239.length < var5) { // L: 145 + field239 = new int[var5]; // L: 146 + field249 = new int[var5]; // L: 147 + field250 = new boolean[var5]; // L: 148 } } + } // L: 150 + + @ObfuscatedName("s") + int method688(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 } - @ObfuscatedName("f") - int method671(int var1, int var2, int var3, int var4, int var5) { - 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("j") - void method669(int var1, int var2, int var3, int var4, float[] var5, int var6) { - int var7 = var4 - var2; - int var8 = var3 - var1; - int var9 = var7 < 0 ? -var7 : var7; - 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) { + @ObfuscatedName("a") + void method689(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 var3 = var6; } - for (int var14 = var1 + 1; var14 < var3; ++var14) { - var12 += var9; - if (var12 >= var8) { - var12 -= var8; - var11 += var13; + 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 } else { - var11 += var10; + var11 += var10; // L: 76 } - var5[var14] *= VorbisFloor_decibelStatics[var11]; + var5[var14] *= VorbisFloor_decibelStatics[var11]; // L: 78 } - } + } // L: 80 - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { - if (var1 < var2) { - int var3 = var1; - int var4 = field259[var1]; - int var5 = field254[var1]; - boolean var6 = field255[var1]; + if (var1 < var2) { // L: 83 + int var3 = var1; // L: 84 + int var4 = field239[var1]; // L: 85 + int var5 = field249[var1]; // L: 86 + boolean var6 = field250[var1]; // L: 87 - for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field259[var7]; - if (var8 < var4) { - field259[var3] = var8; - field254[var3] = field254[var7]; - field255[var3] = field255[var7]; - ++var3; - field259[var7] = field259[var3]; - field254[var7] = field254[var3]; - field255[var7] = field255[var3]; + for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 + int var8 = field239[var7]; // L: 89 + if (var8 < var4) { // L: 90 + field239[var3] = var8; // L: 91 + field249[var3] = field249[var7]; // L: 92 + field250[var3] = field250[var7]; // L: 93 + ++var3; // L: 94 + field239[var7] = field239[var3]; // L: 95 + field249[var7] = field249[var3]; // L: 96 + field250[var7] = field250[var3]; // L: 97 } } - field259[var3] = var4; - field254[var3] = var5; - field255[var3] = var6; - this.VarbisFloor_sort(var1, var3 - 1); - this.VarbisFloor_sort(var3 + 1, var2); + field239[var3] = var4; // L: 100 + field249[var3] = var5; // L: 101 + field250[var3] = var6; // L: 102 + this.VarbisFloor_sort(var1, var3 - 1); // L: 103 + this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } - } + } // L: 105 - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("readSubmapFloor") boolean readSubmapFloor() { - boolean var1 = VorbisSample.readBit() != 0; - if (!var1) { + boolean var1 = VorbisSample.readBit() != 0; // L: 153 + if (!var1) { // L: 154 return false; } else { - int var2 = this.field252.length; + int var2 = this.field241.length; // L: 155 int var3; - for (var3 = 0; var3 < var2; ++var3) { - field259[var3] = this.field252[var3]; + for (var3 = 0; var3 < var2; ++var3) { // L: 156 + field239[var3] = this.field241[var3]; } - var3 = field260[this.multiplier - 1]; - int var4 = class194.iLog(var3 - 1); - field254[0] = VorbisSample.readBits(var4); - field254[1] = VorbisSample.readBits(var4); - int var5 = 2; + var3 = field247[this.multiplier - 1]; // L: 157 + int var4 = class65.iLog(var3 - 1); // L: 158 + field249[0] = VorbisSample.readBits(var4); // L: 159 + field249[1] = VorbisSample.readBits(var4); // L: 160 + int var5 = 2; // L: 161 - 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]].method958(); + 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 + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1006(); } - for (int var12 = 0; var12 < var8; ++var12) { - int var13 = this.subclassBooks[var7][var11 & var10]; - var11 >>>= var9; - field254[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method958() : 0; + for (int var12 = 0; var12 < var8; ++var12) { // L: 169 + int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 + var11 >>>= var9; // L: 171 + field249[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1006() : 0; // L: 172 } } - return true; + return true; // L: 175 } } - @ObfuscatedName("t") - void method673(float[] var1, int var2) { - int var3 = this.field252.length; - int var4 = field260[this.multiplier - 1]; - boolean[] var5 = field255; - field255[1] = true; - var5[0] = true; + @ObfuscatedName("e") + void method692(float[] var1, int var2) { + int var3 = this.field241.length; // L: 179 + int var4 = field247[this.multiplier - 1]; // L: 180 + boolean[] var5 = field250; // L: 181 + field250[1] = true; // L: 182 + var5[0] = true; // L: 183 int var6; int var7; int var8; int var9; int var10; - for (var6 = 2; var6 < var3; ++var6) { - var7 = method681(field259, var6); - var8 = method667(field259, var6); - var9 = this.method671(field259[var7], field254[var7], field259[var8], field254[var8], field259[var6]); - var10 = field254[var6]; - int var11 = var4 - var9; - int var13 = (var11 < var9 ? var11 : var9) << 1; - if (var10 != 0) { - boolean[] var14 = field255; - field255[var8] = true; - var14[var7] = true; - field255[var6] = true; - if (var10 >= var13) { - field254[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + for (var6 = 2; var6 < var3; ++var6) { // L: 184 + var7 = method697(field239, var6); // L: 185 + var8 = method705(field239, var6); // L: 186 + var9 = this.method688(field239[var7], field249[var7], field239[var8], field249[var8], field239[var6]); // L: 187 + var10 = field249[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 = field250; // L: 193 + field250[var8] = true; // L: 195 + var14[var7] = true; // L: 196 + field250[var6] = true; // L: 197 + if (var10 >= var13) { // L: 198 + field249[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field254[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field249[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field255[var6] = false; - field254[var6] = var9; + field250[var6] = false; // L: 206 + field249[var6] = var9; // L: 207 } } - this.VarbisFloor_sort(0, var3 - 1); - var6 = 0; - var7 = field254[0] * this.multiplier; + this.VarbisFloor_sort(0, var3 - 1); // L: 210 + var6 = 0; // L: 211 + var7 = field249[0] * this.multiplier; // L: 212 - for (var8 = 1; var8 < var3; ++var8) { - if (field255[var8]) { - var9 = field259[var8]; - var10 = field254[var8] * this.multiplier; - this.method669(var6, var7, var9, var10, var1, var2); - if (var9 >= var2) { + for (var8 = 1; var8 < var3; ++var8) { // L: 213 + if (field250[var8]) { // L: 214 + var9 = field239[var8]; // L: 215 + var10 = field249[var8] * this.multiplier; // L: 216 + this.method689(var6, var7, var9, var10, var1, var2); // L: 217 + if (var9 >= var2) { // L: 218 return; } - var6 = var9; - var7 = var10; + var6 = var9; // L: 219 + var7 = var10; // L: 220 } } - float var16 = VorbisFloor_decibelStatics[var7]; + float var16 = VorbisFloor_decibelStatics[var7]; // L: 223 - for (var9 = var6; var9 < var2; ++var9) { + for (var9 = var6; var9 < var2; ++var9) { // L: 224 var1[var9] *= var16; } - } + } // L: 225 - @ObfuscatedName("l") - static int method681(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MIN_VALUE; + @ObfuscatedName("i") + static int method697(int[] var0, int var1) { + int var2 = var0[var1]; // L: 22 + int var3 = -1; // L: 23 + int var4 = Integer.MIN_VALUE; // L: 24 - for (int var5 = 0; var5 < var1; ++var5) { - int var6 = var0[var5]; - if (var6 < var2 && var6 > var4) { - var3 = var5; - var4 = var6; + 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 } } - return var3; + return var3; // L: 32 } - @ObfuscatedName("q") - static int method667(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MAX_VALUE; + @ObfuscatedName("w") + static int method705(int[] var0, int var1) { + int var2 = var0[var1]; // L: 36 + int var3 = -1; // L: 37 + int var4 = Integer.MAX_VALUE; // L: 38 - for (int var5 = 0; var5 < var1; ++var5) { - int var6 = var0[var5]; - if (var6 > var2 && var6 < var4) { - var3 = var5; - var4 = var6; + 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 } } - return var3; + return var3; // L: 46 } } diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 3e702e7264..7929c0cf7e 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -5,39 +5,39 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("ap") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("submaps") int submaps; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("mappingMux") int mappingMux; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("submapResidue") int[] submapResidue; VorbisMapping() { - VorbisSample.readBits(16); - this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; - if (VorbisSample.readBit() != 0) { - VorbisSample.readBits(8); + 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(2); - if (this.submaps > 1) { - this.mappingMux = VorbisSample.readBits(4); + VorbisSample.readBits(2); // L: 18 + if (this.submaps > 1) { // L: 19 + this.mappingMux = VorbisSample.readBits(4); // L: 20 } - this.submapFloor = new int[this.submaps]; - this.submapResidue = new int[this.submaps]; + this.submapFloor = new int[this.submaps]; // L: 22 + this.submapResidue = new int[this.submaps]; // L: 23 - for (int var1 = 0; var1 < this.submaps; ++var1) { - VorbisSample.readBits(8); - this.submapFloor[var1] = VorbisSample.readBits(8); - this.submapResidue[var1] = VorbisSample.readBits(8); + 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 } - } + } // L: 29 } diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 54dab59780..bd18dbcb16 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,124 +2,124 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ax") +@ObfuscatedName("an") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("residueType") int residueType; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("begin") int begin; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("end") int end; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("partitionSize") int partitionSize; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("classifications") int classifications; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("classbook") int classbook; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("cascade") int[] cascade; VorbisResidue() { - 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]; + 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 int var2; - for (var2 = 0; var2 < this.classifications; ++var2) { - int var3 = 0; - int var4 = VorbisSample.readBits(3); - boolean var5 = VorbisSample.readBit() != 0; - if (var5) { + 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 var3 = VorbisSample.readBits(5); } - var1[var2] = var3 << 3 | var4; + var1[var2] = var3 << 3 | var4; // L: 27 } - this.cascade = new int[this.classifications * 8]; + this.cascade = new int[this.classifications * 8]; // L: 29 - for (var2 = 0; var2 < this.classifications * 8; ++var2) { + for (var2 = 0; var2 < this.classifications * 8; ++var2) { // L: 30 this.cascade[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? VorbisSample.readBits(8) : -1; } - } + } // L: 31 - @ObfuscatedName("l") - void method785(float[] var1, int var2, boolean var3) { + @ObfuscatedName("i") + void method810(float[] var1, int var2, boolean var3) { int var4; - for (var4 = 0; var4 < var2; ++var4) { + for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; } - 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]; + 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 - for (int var8 = 0; var8 < 8; ++var8) { - int var9 = 0; + for (int var8 = 0; var8 < 8; ++var8) { // L: 40 + int var9 = 0; // L: 41 - while (var9 < var6) { + while (var9 < var6) { // L: 42 int var10; int var11; - if (var8 == 0) { - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method958(); + if (var8 == 0) { // L: 43 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1006(); // L: 45 - for (var11 = var4 - 1; var11 >= 0; --var11) { - if (var9 + var11 < var6) { + for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 + if (var9 + var11 < var6) { // L: 47 var7[var9 + var11] = var10 % this.classifications; } - var10 /= this.classifications; + var10 /= this.classifications; // L: 48 } } - 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]; + 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 int var15; - if (this.residueType == 0) { - var15 = this.partitionSize / var14.dimensions; + if (this.residueType == 0) { // L: 59 + var15 = this.partitionSize / var14.dimensions; // L: 60 - for (int var19 = 0; var19 < var15; ++var19) { - float[] var20 = var14.method957(); + for (int var19 = 0; var19 < var15; ++var19) { // L: 61 + float[] var20 = var14.method1008(); // L: 62 - for (int var18 = 0; var18 < var14.dimensions; ++var18) { + for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; } } } else { - var15 = 0; + var15 = 0; // L: 67 - while (var15 < this.partitionSize) { - float[] var16 = var14.method957(); + while (var15 < this.partitionSize) { // L: 68 + float[] var16 = var14.method1008(); // L: 69 - for (int var17 = 0; var17 < var14.dimensions; ++var17) { - var1[var13 + var15] += var16[var17]; - ++var15; + for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 + var1[var13 + var15] += var16[var17]; // L: 71 + ++var15; // L: 72 } } } } - ++var9; - if (var9 >= var6) { + ++var9; // L: 78 + if (var9 >= var6) { // L: 79 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 9683d3ec1c..6bf447b535 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,645 +3,654 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("af") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lam;" + descriptor = "[Laj;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lag;" + descriptor = "[Lac;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lax;" + descriptor = "[Lan;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "[Lap;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("b") + @ObfuscatedName("n") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("x") - static boolean field365; - @ObfuscatedName("r") - static float[] field370; - @ObfuscatedName("n") - static float[] field366; - @ObfuscatedName("u") - static float[] field372; - @ObfuscatedName("d") - static float[] field373; - @ObfuscatedName("ab") - static float[] field379; - @ObfuscatedName("ad") - static float[] field351; - @ObfuscatedName("as") - static float[] field376; - @ObfuscatedName("ak") - static int[] field348; - @ObfuscatedName("ah") - static int[] field378; - @ObfuscatedName("l") - byte[][] field362; - @ObfuscatedName("q") + @ObfuscatedName("z") + static boolean field342; + @ObfuscatedName("c") + static float[] field356; + @ObfuscatedName("f") + static float[] field357; + @ObfuscatedName("h") + static float[] field358; + @ObfuscatedName("v") + static float[] field359; + @ObfuscatedName("ag") + static float[] field360; + @ObfuscatedName("ae") + static float[] field361; + @ObfuscatedName("aq") + static float[] field350; + @ObfuscatedName("al") + static int[] field363; + @ObfuscatedName("am") + static int[] field364; + @ObfuscatedName("i") + byte[][] field334; + @ObfuscatedName("w") @Export("sampleRate") int sampleRate; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("sampleCount") int sampleCount; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("start") int start; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("k") - boolean field353; - @ObfuscatedName("p") - float[] field377; - @ObfuscatedName("z") - int field374; - @ObfuscatedName("h") - int field371; - @ObfuscatedName("o") - boolean field369; - @ObfuscatedName("ay") + @ObfuscatedName("g") + boolean field339; + @ObfuscatedName("q") + float[] field353; + @ObfuscatedName("d") + int field349; + @ObfuscatedName("r") + int field343; + @ObfuscatedName("m") + boolean field362; + @ObfuscatedName("ai") @Export("samples") byte[] samples; - @ObfuscatedName("al") - int field380; - @ObfuscatedName("ao") - int field381; + @ObfuscatedName("ah") + int field366; + @ObfuscatedName("as") + int field367; static { - field365 = false; + field342 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); - } + this.read(var1); // L: 417 + } // L: 418 - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("read") void read(byte[] var1) { - 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.field353 = true; + 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.field339 = true; // L: 96 } - int var3 = var2.readInt(); - this.field362 = new byte[var3][]; + int var3 = var2.readInt(); // L: 98 + this.field334 = new byte[var3][]; // L: 99 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = 0; + for (int var4 = 0; var4 < var3; ++var4) { // L: 100 + int var5 = 0; // L: 101 int var6; do { - var6 = var2.readUnsignedByte(); - var5 += var6; - } while(var6 >= 255); + var6 = var2.readUnsignedByte(); // L: 103 + var5 += var6; // L: 104 + } while(var6 >= 255); // L: 105 - byte[] var7 = new byte[var5]; - var2.readBytes(var7, 0, var5); - this.field362[var4] = var7; + byte[] var7 = new byte[var5]; // L: 107 + var2.readBytes(var7, 0, var5); // L: 108 + this.field334[var4] = var7; // L: 109 } - } + } // L: 111 - @ObfuscatedName("t") - float[] method973(int var1) { - VorbisSample_setData(this.field362[var1], 0); - readBit(); - int var2 = readBits(class194.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; + @ObfuscatedName("e") + float[] method1026(int var1) { + VorbisSample_setData(this.field334[var1], 0); // L: 198 + readBit(); // L: 199 + int var2 = readBits(class65.iLog(VorbisSample_mapping.length - 1)); // L: 200 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 + boolean var5 = false; // L: 203 + boolean var6 = false; // L: 204 + if (var3) { // L: 205 + var5 = readBit() != 0; // L: 206 + var6 = readBit() != 0; // L: 207 } - int var7 = var4 >> 1; + int var7 = var4 >> 1; // L: 209 int var8; int var9; int var10; - if (var3 && !var5) { - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); - var10 = VorbisSample_blockSize0 >> 1; + if (var3 && !var5) { // L: 213 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215 + var10 = VorbisSample_blockSize0 >> 1; // L: 216 } else { - var8 = 0; - var9 = var7; - var10 = var4 >> 1; + var8 = 0; // L: 219 + var9 = var7; // L: 220 + var10 = var4 >> 1; // L: 221 } int var11; int var12; int var13; - if (var3 && !var6) { - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); - var13 = VorbisSample_blockSize0 >> 1; + if (var3 && !var6) { // L: 226 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228 + var13 = VorbisSample_blockSize0 >> 1; // L: 229 } else { - var11 = var7; - var12 = var4; - var13 = var4 >> 1; + var11 = var7; // L: 232 + var12 = var4; // L: 233 + var13 = var4 >> 1; // L: 234 } - 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; + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236 + int var16 = var14.mappingMux; // L: 239 + int var17 = var14.submapFloor[var16]; // L: 240 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241 + boolean var45 = var15; // L: 243 - for (var17 = 0; var17 < var14.submaps; ++var17) { - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var44 = field370; - var42.method785(var44, var4 >> 1, var45); + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 + float[] var44 = field356; // L: 246 + var42.method810(var44, var4 >> 1, var45); // L: 247 } int var18; - if (!var15) { - var17 = var14.mappingMux; - var18 = var14.submapFloor[var17]; - VorbisSample_floors[var18].method673(field370, var4 >> 1); + if (!var15) { // L: 250 + var17 = var14.mappingMux; // L: 251 + var18 = var14.submapFloor[var17]; // L: 252 + VorbisSample_floors[var18].method692(field356, var4 >> 1); // L: 253 } int var19; - if (var15) { - for (var17 = var4 >> 1; var17 < var4; ++var17) { - field370[var17] = 0.0F; + if (var15) { // L: 256 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 + field356[var17] = 0.0F; } } else { - var17 = var4 >> 1; - var18 = var4 >> 2; - var19 = var4 >> 3; - float[] var20 = field370; + var17 = var4 >> 1; // L: 260 + var18 = var4 >> 2; // L: 261 + var19 = var4 >> 3; // L: 262 + float[] var20 = field356; // L: 263 int var21; - for (var21 = 0; var21 < var17; ++var21) { + for (var21 = 0; var21 < var17; ++var21) { // L: 264 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { + for (var21 = var17; var21 < var4; ++var21) { // L: 265 var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field379 : field366; - float[] var22 = var3 ? field351 : field372; - float[] var23 = var3 ? field376 : field373; - int[] var24 = var3 ? field378 : field348; + float[] var40 = var3 ? field360 : field357; // L: 266 + float[] var22 = var3 ? field361 : field358; // L: 267 + float[] var23 = var3 ? field350 : field359; // L: 268 + int[] var24 = var3 ? field364 : field363; // L: 269 int var25; float var26; float var27; float var28; float var29; - 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; + for (var25 = 0; var25 < var18; ++var25) { // L: 270 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272 + var28 = var40[var25 * 2]; // L: 273 + var29 = var40[var25 * 2 + 1]; // L: 274 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276 } float var30; float var31; - for (var25 = 0; var25 < var19; ++var25) { - 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; + for (var25 = 0; var25 < var19; ++var25) { // L: 278 + var26 = var20[var17 + var25 * 4 + 3]; // L: 279 + var27 = var20[var17 + var25 * 4 + 1]; // L: 280 + var28 = var20[var25 * 4 + 3]; // L: 281 + var29 = var20[var25 * 4 + 1]; // L: 282 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284 + var30 = var40[var17 - 4 - var25 * 4]; // L: 285 + var31 = var40[var17 - 3 - var25 * 4]; // L: 286 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = class194.iLog(var4 - 1); + var25 = class65.iLog(var4 - 1); // L: 290 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { - var47 = var4 >> var46 + 2; - var48 = 8 << var46; + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291 + var47 = var4 >> var46 + 2; // L: 292 + var48 = 8 << var46; // L: 293 - for (var49 = 0; var49 < 2 << var46; ++var49) { - int var50 = var4 - var47 * var49 * 2; - int var51 = var4 - var47 * (var49 * 2 + 1); + for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294 + int var50 = var4 - var47 * var49 * 2; // L: 295 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296 - for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { - 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 (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297 + int var33 = var32 * 4; // L: 298 + float var34 = var20[var50 - 1 - var33]; // L: 299 + float var35 = var20[var50 - 3 - var33]; // L: 300 + float var36 = var20[var51 - 1 - var33]; // L: 301 + float var37 = var20[var51 - 3 - var33]; // L: 302 + var20[var50 - 1 - var33] = var34 + var36; // L: 303 + var20[var50 - 3 - var33] = var35 + var37; // L: 304 + float var38 = var40[var32 * var48]; // L: 305 + float var39 = var40[var32 * var48 + 1]; // L: 306 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308 } } } - for (var46 = 1; var46 < var19 - 1; ++var46) { - 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 = 1; var46 < var19 - 1; ++var46) { // L: 312 + var47 = var24[var46]; // L: 313 + if (var46 < var47) { // L: 314 + var48 = var46 * 8; // L: 315 + var49 = var47 * 8; // L: 316 + var30 = var20[var48 + 1]; // L: 318 + var20[var48 + 1] = var20[var49 + 1]; // L: 319 + var20[var49 + 1] = var30; // L: 320 + var30 = var20[var48 + 3]; // L: 321 + var20[var48 + 3] = var20[var49 + 3]; // L: 322 + var20[var49 + 3] = var30; // L: 323 + var30 = var20[var48 + 5]; // L: 324 + var20[var48 + 5] = var20[var49 + 5]; // L: 325 + var20[var49 + 5] = var30; // L: 326 + var30 = var20[var48 + 7]; // L: 327 + var20[var48 + 7] = var20[var49 + 7]; // L: 328 + var20[var49 + 7] = var30; // L: 329 } } - for (var46 = 0; var46 < var17; ++var46) { + for (var46 = 0; var46 < var17; ++var46) { // L: 332 var20[var46] = var20[var46 * 2 + 1]; } - 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: 333 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337 } - for (var46 = 0; var46 < var19; ++var46) { - 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 < var19; ++var46) { // L: 339 + var27 = var23[var46 * 2]; // L: 340 + var28 = var23[var46 * 2 + 1]; // L: 341 + var29 = var20[var17 + var46 * 2]; // L: 342 + var30 = var20[var17 + var46 * 2 + 1]; // L: 343 + var31 = var20[var4 - 2 - var46 * 2]; // L: 344 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 345 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351 } - for (var46 = 0; var46 < var18; ++var46) { - 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: 353 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355 } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 357 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 358 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 359 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 360 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field370; + for (var46 = var8; var46 < var9; ++var46) { // L: 361 + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 + var10000 = field356; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field370; + for (var46 = var11; var46 < var12; ++var46) { // L: 365 + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 + var10000 = field356; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; - if (this.field374 > 0) { - var18 = var4 + this.field374 >> 2; - var41 = new float[var18]; + float[] var41 = null; // L: 370 + if (this.field349 > 0) { // L: 371 + var18 = var4 + this.field349 >> 2; // L: 372 + var41 = new float[var18]; // L: 373 int var43; - if (!this.field369) { - for (var19 = 0; var19 < this.field371; ++var19) { - var43 = var19 + (this.field374 >> 1); - var41[var19] += this.field377[var43]; + if (!this.field362) { // L: 374 + for (var19 = 0; var19 < this.field343; ++var19) { // L: 375 + var43 = var19 + (this.field349 >> 1); // L: 376 + var41[var19] += this.field353[var43]; // L: 377 } } - if (!var15) { - for (var19 = var8; var19 < var4 >> 1; ++var19) { - var43 = var41.length - (var4 >> 1) + var19; - var41[var43] += field370[var19]; + if (!var15) { // L: 380 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 + var43 = var41.length - (var4 >> 1) + var19; // L: 382 + var41[var43] += field356[var19]; // L: 383 } } } - float[] var54 = this.field377; - this.field377 = field370; - field370 = var54; - this.field374 = var4; - this.field371 = var12 - (var4 >> 1); - this.field369 = var15; - return var41; + float[] var54 = this.field353; // L: 387 + this.field353 = field356; // L: 388 + field356 = var54; // L: 389 + this.field349 = var4; // L: 390 + this.field343 = var12 - (var4 >> 1); // L: 391 + this.field362 = var15; // L: 392 + return var41; // L: 393 } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([I)Laa;" + descriptor = "([I)Laz;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { + if (var1 != null && var1[0] <= 0) { // L: 421 return null; } else { - if (this.samples == null) { - this.field374 = 0; - this.field377 = new float[VorbisSample_blockSize1]; - this.samples = new byte[this.sampleCount]; - this.field380 = 0; - this.field381 = 0; + if (this.samples == null) { // L: 422 + this.field349 = 0; // L: 423 + this.field353 = new float[VorbisSample_blockSize1]; // L: 424 + this.samples = new byte[this.sampleCount]; // L: 425 + this.field366 = 0; // L: 426 + this.field367 = 0; // L: 427 } - for (; this.field381 < this.field362.length; ++this.field381) { - if (var1 != null && var1[0] <= 0) { + for (; this.field367 < this.field334.length; ++this.field367) { // L: 429 444 + if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method973(this.field381); - if (var2 != null) { - int var3 = this.field380; - int var4 = var2.length; - if (var4 > this.sampleCount - var3) { + float[] var2 = this.method1026(this.field367); // L: 431 + if (var2 != null) { // L: 432 + int var3 = this.field366; // L: 433 + int var4 = var2.length; // L: 434 + if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { - int var6 = (int)(128.0F + var2[var5] * 128.0F); - if ((var6 & -256) != 0) { + for (int var5 = 0; var5 < var4; ++var5) { // L: 436 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437 + if ((var6 & -256) != 0) { // L: 438 var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); + this.samples[var3++] = (byte)(var6 - 128); // L: 439 } - if (var1 != null) { - var1[0] -= var3 - this.field380; + if (var1 != null) { // L: 441 + var1[0] -= var3 - this.field366; } - this.field380 = var3; + this.field366 = var3; // L: 442 } } - this.field377 = null; - byte[] var7 = this.samples; - this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field353); + this.field353 = null; // L: 446 + byte[] var7 = this.samples; // L: 447 + this.samples = null; // L: 448 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field339); // L: 449 } } - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("float32Unpack") static float float32Unpack(int var0) { - int var1 = var0 & 2097151; - int var2 = var0 & Integer.MIN_VALUE; - int var3 = (var0 & 2145386496) >> 21; - if (var2 != 0) { + 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 var1 = -var1; } - return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); + return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { - VorbisSample_bytes = var0; - VorbisSample_byteOffset = var1; - VorbisSample_bitOffset = 0; - } + VorbisSample_bytes = var0; // L: 55 + VorbisSample_byteOffset = var1; // L: 56 + VorbisSample_bitOffset = 0; // L: 57 + } // L: 58 - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("readBit") static int readBit() { - int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; - ++VorbisSample_bitOffset; - VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; - VorbisSample_bitOffset &= 7; - return var0; + 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 } - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("readBits") static int readBits(int var0) { - int var1 = 0; + int var1 = 0; // L: 69 int var2; int var3; - 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; + 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 } - if (var0 > 0) { - var3 = (1 << var0) - 1; - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; - VorbisSample_bitOffset += var0; + 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 } - return var1; + return var1; // L: 85 } - @ObfuscatedName("k") - static void method1002(byte[] var0) { - VorbisSample_setData(var0, 0); - VorbisSample_blockSize0 = 1 << readBits(4); - VorbisSample_blockSize1 = 1 << readBits(4); - field370 = new float[VorbisSample_blockSize1]; + @ObfuscatedName("g") + static void method1025(byte[] var0) { + VorbisSample_setData(var0, 0); // L: 114 + VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 + VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 + field356 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; int var3; int var4; int var5; - 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 (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[] var18 = new float[var3]; // L: 123 - 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)); + for (int var7 = 0; var7 < var4; ++var7) { // L: 124 + var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var13 = new float[var3]; + float[] var19 = new float[var3]; // L: 128 - 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)); + for (int var8 = 0; var8 < var4; ++var8) { // L: 129 + var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var14 = new float[var4]; + float[] var20 = new float[var4]; // L: 133 - 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)); + for (int var9 = 0; var9 < var5; ++var9) { // L: 134 + var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var15 = new int[var5]; - int var10 = class194.iLog(var5 - 1); + int[] var21 = new int[var5]; // L: 138 + int var10 = class65.iLog(var5 - 1); // L: 139 - for (int var11 = 0; var11 < var5; ++var11) { - var15[var11] = WorldMapElement.method2922(var11, var10); + for (int var11 = 0; var11 < var5; ++var11) { // L: 140 + int var15 = var11; // L: 144 + int var16 = var10; // L: 145 + + int var17; + for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151 + var17 = var17 << 1 | var15 & 1; // L: 149 + var15 >>>= 1; // L: 150 + } + + var21[var11] = var17; // L: 155 } - if (var1 != 0) { - field379 = var12; - field351 = var13; - field376 = var14; - field378 = var15; + if (var1 != 0) { // L: 157 + field360 = var18; // L: 158 + field361 = var19; // L: 159 + field350 = var20; // L: 160 + field364 = var21; // L: 161 } else { - field366 = var12; - field372 = var13; - field373 = var14; - field348 = var15; + field357 = var18; // L: 164 + field358 = var19; // L: 165 + field359 = var20; // L: 166 + field363 = var21; // L: 167 } } - var1 = readBits(8) + 1; - VorbisSample_codebooks = new VorbisCodebook[var1]; + var1 = readBits(8) + 1; // L: 170 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171 - for (var2 = 0; var2 < var1; ++var2) { + for (var2 = 0; var2 < var1; ++var2) { // L: 172 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; + var2 = readBits(6) + 1; // L: 174 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 175 readBits(16); } - var2 = readBits(6) + 1; - VorbisSample_floors = new VorbisFloor[var2]; + var2 = readBits(6) + 1; // L: 177 + VorbisSample_floors = new VorbisFloor[var2]; // L: 178 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 179 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; - VorbisSample_residues = new VorbisResidue[var3]; + var3 = readBits(6) + 1; // L: 180 + VorbisSample_residues = new VorbisResidue[var3]; // L: 181 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 182 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; - VorbisSample_mappings = new VorbisMapping[var4]; + var4 = readBits(6) + 1; // L: 183 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 184 - for (var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { // L: 185 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; - VorbisSample_blockFlags = new boolean[var5]; - VorbisSample_mapping = new int[var5]; + var5 = readBits(6) + 1; // L: 186 + VorbisSample_blockFlags = new boolean[var5]; // L: 187 + VorbisSample_mapping = new int[var5]; // L: 188 - for (int var6 = 0; var6 < var5; ++var6) { - VorbisSample_blockFlags[var6] = readBit() != 0; - readBits(16); - readBits(16); - VorbisSample_mapping[var6] = readBits(8); + for (int var6 = 0; var6 < var5; ++var6) { // L: 189 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190 + readBits(16); // L: 191 + readBits(16); // L: 192 + VorbisSample_mapping[var6] = readBits(8); // L: 193 } - } + } // L: 195 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkl;)Z" + descriptor = "(Lko;)Z" ) - static boolean method987(AbstractArchive var0) { - if (!field365) { - byte[] var1 = var0.takeFile(0, 0); - if (var1 == null) { + static boolean method1027(AbstractArchive var0) { + if (!field342) { // L: 397 + byte[] var1 = var0.takeFile(0, 0); // L: 398 + if (var1 == null) { // L: 399 return false; } - method1002(var1); - field365 = true; + method1025(var1); // L: 400 + field342 = true; // L: 401 } - return true; + return true; // L: 403 } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lkl;II)Law;" + descriptor = "(Lko;II)Laf;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method987(var0)) { - var0.tryLoadFile(var1, var2); - return null; + if (!method1027(var0)) { // L: 407 + var0.tryLoadFile(var1, var2); // L: 408 + return null; // L: 409 } else { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new VorbisSample(var3); + byte[] var3 = var0.takeFile(var1, var2); // L: 411 + return var3 == null ? null : new VorbisSample(var3); // L: 412 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index c240e231a5..fe19efc1c1 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,146 +4,295 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hn") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("l") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = -486262227 + intValue = -1033840405 + ) + static int field2630; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1965737053 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1658643165 + intValue = 2050472171 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -457731185 + intValue = 1125986265 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1010602035 + intValue = -1018369897 ) @Export("orientation") int orientation; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1936125561 + intValue = 928141821 ) @Export("orientation2") int orientation2; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1930286525 + intValue = 1446275315 ) @Export("xOffset") int xOffset; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -607759825 + intValue = -1672015371 ) @Export("yOffset") int yOffset; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lhj;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -1585251643949812861L + longValue = 8832099420400585997L ) @Export("tag") public long tag; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 148336509 + intValue = 462629417 ) @Export("flags") int flags; WallDecoration() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 13 + this.flags = 0; // L: 14 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(S)[Lin;", - garbageValue = "180" + descriptor = "(CLkz;I)I", + garbageValue = "-503554425" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2878, ServerPacket.field2882, ServerPacket.field2869, ServerPacket.field2790, ServerPacket.field2791, ServerPacket.field2792, ServerPacket.field2862, ServerPacket.field2794, ServerPacket.field2827, ServerPacket.field2841, ServerPacket.field2832, ServerPacket.field2798, ServerPacket.field2799, ServerPacket.field2789, ServerPacket.field2804, ServerPacket.field2802, ServerPacket.field2795, ServerPacket.field2816, ServerPacket.field2805, ServerPacket.field2806, ServerPacket.field2807, ServerPacket.field2803, ServerPacket.field2809, ServerPacket.field2810, ServerPacket.field2811, ServerPacket.field2808, ServerPacket.field2813, ServerPacket.field2817, ServerPacket.field2815, ServerPacket.field2812, ServerPacket.field2801, ServerPacket.field2818, ServerPacket.field2819, ServerPacket.field2820, ServerPacket.field2788, ServerPacket.field2822, ServerPacket.field2823, ServerPacket.field2796, ServerPacket.field2845, ServerPacket.field2826, ServerPacket.field2821, ServerPacket.field2828, ServerPacket.field2829, ServerPacket.field2830, ServerPacket.field2831, ServerPacket.field2814, ServerPacket.field2833, ServerPacket.field2834, ServerPacket.field2835, ServerPacket.field2797, ServerPacket.field2836, ServerPacket.field2838, ServerPacket.field2839, ServerPacket.field2840, ServerPacket.field2865, ServerPacket.field2787, ServerPacket.field2843, ServerPacket.field2844, ServerPacket.field2879, ServerPacket.field2846, ServerPacket.field2847, ServerPacket.field2793, ServerPacket.field2849, ServerPacket.field2850, ServerPacket.field2851, ServerPacket.field2852, ServerPacket.field2853, ServerPacket.field2861, ServerPacket.field2855, ServerPacket.field2848, ServerPacket.field2857, ServerPacket.field2858, ServerPacket.field2859, ServerPacket.field2860, ServerPacket.field2824, ServerPacket.field2874, ServerPacket.field2863, ServerPacket.field2864, ServerPacket.field2856, ServerPacket.field2800, ServerPacket.field2867, ServerPacket.field2868, ServerPacket.field2866, ServerPacket.field2870, ServerPacket.field2871, ServerPacket.field2872, ServerPacket.field2873, ServerPacket.field2842, ServerPacket.field2875, ServerPacket.field2876, ServerPacket.field2877, ServerPacket.field2854, ServerPacket.field2837, ServerPacket.field2880, ServerPacket.field2881}; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1531705117" - ) - public static String method4580(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); - - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class317.field3869[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class317.field3869[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class317.field3869[(var6 & 15) << 2 | var7 >>> 6]).append(class317.field3869[var7 & 63]); - } else { - var3.append(class317.field3869[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class317.field3869[(var5 & 3) << 4]).append("=="); - } + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 104 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 + var0 = Character.toLowerCase(var0); // L: 106 + var2 = (var0 << 4) + 1; // L: 107 } - return var3.toString(); + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; + } + + return var2; // L: 110 } - @ObfuscatedName("av") + @ObfuscatedName("hk") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "-20" + descriptor = "(IIB)V", + garbageValue = "32" ) - static int method4581(int var0, Script var1, boolean var2) { - if (var0 == 6800) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6801 && var0 != 6802) { - if (var0 == 6850) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6851 && var0 != 6852) { - if (var0 == 6853) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var0][var1]; // L: 7726 + if (var2 == null) { // L: 7727 + GameBuild.scene.removeGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1); // L: 7728 } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; + long var3 = -99999999L; // L: 7731 + TileItem var5 = null; // L: 7732 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7733 7734 7742 + ItemComposition var7 = TaskHandler.ItemDefinition_get(var6.id); // L: 7735 + long var11 = (long)var7.price; // L: 7736 + if (var7.isStackable == 1) { // L: 7737 + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { // L: 7738 + var3 = var11; // L: 7739 + var5 = var6; // L: 7740 + } + } + + if (var5 == null) { // L: 7744 + GameBuild.scene.removeGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1); // L: 7745 + } else { + var2.addLast(var5); // L: 7748 + TileItem var13 = null; // L: 7749 + TileItem var8 = null; // L: 7750 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7751 7752 7757 + if (var6.id != var5.id) { // L: 7753 + if (var13 == null) { // L: 7754 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7755 + var8 = var6; + } + } + } + + long var9 = PacketBuffer.calculateTag(var0, var1, 3, false, 0); // L: 7759 + GameBuild.scene.newGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1, class392.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeOfferTotalQuantityComparator.Client_plane), var5, var9, var13, var8); // L: 7760 + } } + } // L: 7729 7746 7761 + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(Ljf;IIII)V", + garbageValue = "-827944855" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class14.playPcmPlayers(); // L: 11628 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11629 + if (var4 != null) { // L: 11630 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11631 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11632 + int var5 = Client.camAngleY & 2047; // L: 11633 + int var6 = HealthBarDefinition.localPlayer.x / 32 + 48; // L: 11634 + int var7 = 464 - HealthBarDefinition.localPlayer.y / 32; // L: 11635 + class10.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11636 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11637 + var16 = Client.mapIconXs[var8] * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11638 + var10 = Client.mapIconYs[var8] * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11639 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11640 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11642 + for (var16 = 0; var16 < 104; ++var16) { // L: 11643 + NodeDeque var14 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var8][var16]; // L: 11644 + if (var14 != null) { // L: 11645 + var11 = var8 * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11646 + var12 = var16 * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11647 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var11, var12, class115.mapDotSprites[0], var4); // L: 11648 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11652 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11653 + if (var9 != null && var9.isVisible()) { // L: 11654 + NPCComposition var18 = var9.definition; // L: 11655 + if (var18 != null && var18.transforms != null) { // L: 11656 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11657 + var11 = var9.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11658 + var12 = var9.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11659 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var11, var12, class115.mapDotSprites[1], var4); // L: 11660 + } + } + } + + var8 = Players.Players_count; // L: 11664 + int[] var17 = Players.Players_indices; // L: 11665 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11666 + Player var15 = Client.players[var17[var10]]; // L: 11667 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != HealthBarDefinition.localPlayer) { // L: 11668 + var12 = var15.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11669 + int var13 = var15.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11670 + if (var15.isFriend()) { // L: 11671 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[3], var4); + } else if (HealthBarDefinition.localPlayer.team != 0 && var15.team != 0 && var15.team == HealthBarDefinition.localPlayer.team) { // L: 11672 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 11673 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 11674 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[6], var4); + } else { + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[2], var4); // L: 11675 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11678 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11679 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11680 + if (var19 != null) { // L: 11681 + var11 = var19.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11682 + var12 = var19.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11683 + class383.worldToMinimap(var1, var2, var11, var12, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11684 + } + } + + if (Client.hintArrowType == 2) { // L: 11687 + var10 = Client.hintArrowX * 4 - class19.baseX * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11688 + var11 = Client.hintArrowY * 4 - DefaultsGroup.baseY * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11689 + class383.worldToMinimap(var1, var2, var10, var11, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11690 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11692 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11693 + if (var20 != null) { // L: 11694 + var11 = var20.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11695 + var12 = var20.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11696 + class383.worldToMinimap(var1, var2, var11, var12, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11697 + } + } + } + + if (Client.destinationX != 0) { // L: 11701 + var10 = Client.destinationX * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11702 + var11 = Client.destinationY * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11703 + WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapIcon_0.mapMarkerSprites[0], var4); // L: 11704 + } + + if (!HealthBarDefinition.localPlayer.isHidden) { // L: 11706 + 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: 11708 + } + + Client.field553[var3] = true; // L: 11709 + } + } // L: 11710 + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-916195379" + ) + static String method4643(String var0) { + PlayerType[] var1 = VarbitComposition.PlayerType_values(); // L: 12028 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12029 + PlayerType var3 = var1[var2]; // L: 12030 + if (var3.modIcon != -1 && var0.startsWith(SpriteMask.method4998(var3.modIcon))) { // L: 12032 12033 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12034 + break; + } + } + + return var0; // L: 12041 } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 86af9f959e..6256e66ed9 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,1383 +4,1385 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jf") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("uv") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkj;" - ) - public static class300 field3165; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[[Ljt;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("Widget_modelsArchive") - public static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("g") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("b") - public static boolean field3045; - @ObfuscatedName("x") + @ObfuscatedName("n") + public static boolean field3049; + @ObfuscatedName("z") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1239763633 + intValue = -830177389 ) @Export("id") public int id; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -886488703 + intValue = 855382617 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1172876095 + intValue = -918896741 ) @Export("type") public int type; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -83198569 + intValue = 1801435393 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 151333425 + intValue = -1660525629 ) @Export("contentType") public int contentType; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 604390457 + intValue = 284180189 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1107777295 + intValue = -107040825 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -578564921 + intValue = -2054031979 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 243916291 + intValue = -1765529153 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1337119043 + intValue = -716032615 ) @Export("rawX") public int rawX; - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -526147055 + intValue = -84019821 ) @Export("rawY") public int rawY; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 359431951 + intValue = -966786115 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ah") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -563564287 + intValue = -727779257 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 754583103 + intValue = -836435373 ) @Export("x") public int x; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -66554765 + intValue = 470259933 ) @Export("y") public int y; - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -2019463933 + intValue = -1492995549 ) @Export("width") public int width; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1955651309 + intValue = 1623576255 ) @Export("height") public int height; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 290577259 + intValue = 1759853159 ) - public int field3067; - @ObfuscatedName("ag") + public int field3068; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 38890935 + intValue = -9428879 ) - public int field3136; - @ObfuscatedName("aq") + public int field3069; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 802202319 + intValue = 528333103 ) @Export("parentId") public int parentId; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ac") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1647106185 + intValue = 168917907 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 379140179 + intValue = 1094545789 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1993150083 + intValue = 1040080419 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1068415699 + intValue = -1297742855 ) @Export("scrollHeight") public int scrollHeight; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -892929689 + intValue = -1557539219 ) @Export("color") public int color; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2093001181 + intValue = 37220023 ) @Export("color2") public int color2; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -415375271 + intValue = 1939141949 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("am") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -557724983 + intValue = -664309699 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("fill") public boolean fill; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Lom;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ae") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1463185953 + intValue = -1200768777 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1030436607 + intValue = 1147011099 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1155135239 + intValue = 1035105757 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bz") - public boolean field3081; - @ObfuscatedName("bt") + @ObfuscatedName("bg") + public boolean field3085; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -1605814115 + intValue = 338387711 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 805516873 + intValue = -1784284609 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -261092147 + intValue = 1886200049 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bj") + @ObfuscatedName("bt") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bo") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -81220287 + intValue = 460210347 ) @Export("outline") public int outline; - @ObfuscatedName("bx") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 96251317 + intValue = -940365255 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1936984001 + intValue = 1682155053 ) @Export("modelType") public int modelType; - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 617278149 + intValue = 1325924463 ) @Export("modelId") public int modelId; - @ObfuscatedName("bv") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -230164833 + intValue = -1907857883 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -74142311 + intValue = -294218779 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bd") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 1444892265 + intValue = 995334035 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1467040689 + intValue = 359756345 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1967675591 + intValue = -1329362105 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bi") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -789464497 + intValue = 1310924187 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1294872275 + intValue = 1082654603 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("by") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 315650477 + intValue = 2109691849 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("be") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 787747681 + intValue = -383796933 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bw") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 2013447747 + intValue = -588937837 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1278808337 + intValue = 368452663 ) - public int field3102; - @ObfuscatedName("bl") + public int field3106; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 905870085 + intValue = 168328461 ) - public int field3038; - @ObfuscatedName("bk") + public int field3165; + @ObfuscatedName("by") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -510674147 + intValue = 57057327 ) @Export("itemQuantityMode") public int itemQuantityMode; @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1603883435 + intValue = 928434151 ) @Export("fontId") public int fontId; - @ObfuscatedName("ct") + @ObfuscatedName("cq") @Export("text") public String text; - @ObfuscatedName("cy") + @ObfuscatedName("ck") @Export("text2") public String text2; - @ObfuscatedName("cg") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -1721306803 + intValue = 150906213 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ci") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -591425127 + intValue = 1685073913 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cx") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1728022553 + intValue = -556962931 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cd") + @ObfuscatedName("ct") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cp") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -1282237629 + intValue = -1531986129 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cl") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1042618055 + intValue = 176722309 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cr") + @ObfuscatedName("cl") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cq") + @ObfuscatedName("cs") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cs") + @ObfuscatedName("ce") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cw") + @ObfuscatedName("cp") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ce") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -1141593057 + intValue = -1837183897 ) @Export("flags") public int flags; - @ObfuscatedName("cz") - public boolean field3121; + @ObfuscatedName("cw") + public boolean field3125; + @ObfuscatedName("cr") + public byte[][] field3180; @ObfuscatedName("cu") - public byte[][] field3115; - @ObfuscatedName("cv") - public byte[][] field3123; - @ObfuscatedName("cn") - public int[] field3147; - @ObfuscatedName("cf") - public int[] field3066; - @ObfuscatedName("ck") + public byte[][] field3105; + @ObfuscatedName("cc") + public int[] field3128; + @ObfuscatedName("ch") + public int[] field3129; + @ObfuscatedName("co") @Export("dataText") public String dataText; - @ObfuscatedName("cb") + @ObfuscatedName("cy") @Export("actions") public String[] actions; - @ObfuscatedName("cm") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljf;" ) @Export("parent") public Widget parent; - @ObfuscatedName("db") + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = -754803859 + intValue = -1233976297 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dx") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -776072407 + intValue = 1376334067 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dd") + @ObfuscatedName("da") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dp") + @ObfuscatedName("dw") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dq") + @ObfuscatedName("dn") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("du") + @ObfuscatedName("dc") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dc") + @ObfuscatedName("dh") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dy") + @ObfuscatedName("du") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dl") + @ObfuscatedName("db") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("df") + @ObfuscatedName("dp") @Export("onHold") public Object[] onHold; @ObfuscatedName("dj") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dm") + @ObfuscatedName("dt") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dt") + @ObfuscatedName("dy") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dr") + @ObfuscatedName("ds") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("do") + @ObfuscatedName("de") @Export("onDragComplete") public Object[] onDragComplete; @ObfuscatedName("dg") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dv") + @ObfuscatedName("di") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("di") + @ObfuscatedName("do") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dw") + @ObfuscatedName("dr") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dn") + @ObfuscatedName("dz") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dh") + @ObfuscatedName("dx") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("ds") + @ObfuscatedName("dd") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("da") + @ObfuscatedName("dl") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("dk") + @ObfuscatedName("dm") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dz") + @ObfuscatedName("dk") @Export("onOp") public Object[] onOp; - @ObfuscatedName("de") + @ObfuscatedName("dv") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("et") + @ObfuscatedName("ed") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ev") + @ObfuscatedName("ej") @Export("onKey") public Object[] onKey; - @ObfuscatedName("es") - public Object[] field3157; - @ObfuscatedName("ee") - public Object[] field3158; - @ObfuscatedName("ef") + @ObfuscatedName("eu") + public Object[] field3161; + @ObfuscatedName("eh") + public Object[] field3162; + @ObfuscatedName("ec") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("eu") + @ObfuscatedName("ek") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("eb") - public Object[] field3161; - @ObfuscatedName("ez") - public Object[] field3163; - @ObfuscatedName("er") + @ObfuscatedName("ea") + public Object[] field3056; + @ObfuscatedName("em") + public Object[] field3166; + @ObfuscatedName("ep") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ea") + @ObfuscatedName("el") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ej") + @ObfuscatedName("et") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ek") + @ObfuscatedName("ex") @Export("onResize") public Object[] onResize; @ObfuscatedName("ew") @Export("onStockTransmit") public Object[] onStockTransmit; + @ObfuscatedName("er") + public Object[] field3172; @ObfuscatedName("eg") - public Object[] field3168; - @ObfuscatedName("ec") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("ei") + @ObfuscatedName("ez") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("eq") + @ObfuscatedName("eb") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("eh") + @ObfuscatedName("eo") @ObfuscatedGetter( - intValue = 1331506921 + intValue = -712270533 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ep") + @ObfuscatedName("ev") @Export("spellName") public String spellName; - @ObfuscatedName("en") + @ObfuscatedName("ee") @Export("buttonText") public String buttonText; - @ObfuscatedName("ed") + @ObfuscatedName("ey") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ey") + @ObfuscatedName("ei") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ex") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = 1708716531 + intValue = -1000336005 ) @Export("itemId") public int itemId; - @ObfuscatedName("eo") + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -1521917383 + intValue = -119048843 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("el") + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = 1043627497 + intValue = 1683480099 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("em") + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = -886660969 + intValue = -1549295787 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("fs") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "[Ljt;" + descriptor = "[Ljf;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fi") + @ObfuscatedName("fa") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fb") + @ObfuscatedName("fi") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fp") + @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = -2088196585 + intValue = 500124989 ) - public int field3064; + public int field3188; + @ObfuscatedName("fw") + @ObfuscatedGetter( + intValue = -898435809 + ) + public int field3189; @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = 1027764261 + intValue = -242702175 ) - public int field3185; - @ObfuscatedName("fz") - @ObfuscatedGetter( - intValue = -1002447235 - ) - public int field3186; + public int field3073; @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = 80527699 + intValue = -592278881 ) - public int field3187; - @ObfuscatedName("fk") + public int field3191; + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 1516024327 + intValue = -1719884029 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fm") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = -1555978879 + intValue = 11938569 ) @Export("cycle") public int cycle; - @ObfuscatedName("ff") - public int[] field3190; - @ObfuscatedName("fd") + @ObfuscatedName("fn") + public int[] field3194; + @ObfuscatedName("ft") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fn") + @ObfuscatedName("fl") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fo") + @ObfuscatedName("fe") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { - Widget_cachedSprites = new EvictingDualNodeHashTable(200); - Widget_cachedModels = new EvictingDualNodeHashTable(50); - Widget_cachedFonts = new EvictingDualNodeHashTable(20); - Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field3045 = false; + Widget_cachedSprites = new EvictingDualNodeHashTable(200); // L: 31 + Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 + Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 + field3049 = false; // L: 35 } public Widget() { - 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.field3067 = 1; - this.field3136 = 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 = FillMode.SOLID; - this.transparencyTop = 0; - this.transparencyBot = 0; - this.lineWid = 1; - this.field3081 = 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.field3102 = 0; - this.field3038 = 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.field3121 = 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.field3064 = -1; - this.field3185 = 0; - this.field3186 = 0; - this.field3187 = 0; - this.rootIndex = -1; - this.cycle = -1; - this.noClickThrough = false; - this.noScrollThrough = false; - this.prioritizeMenuEntry = false; - } + 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.field3068 = 1; // L: 54 + this.field3069 = 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.field3085 = 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.field3106 = 0; // L: 92 + this.field3165 = 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.field3125 = 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.field3188 = -1; // L: 178 + this.field3189 = 0; // L: 179 + this.field3073 = 0; // L: 180 + this.field3191 = 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 + } // L: 724 - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "2061561057" + descriptor = "(Lop;I)V", + garbageValue = "-1471945401" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - 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.isIf3 = false; // L: 240 + this.type = var1.readUnsignedByte(); // L: 241 + this.buttonType = var1.readUnsignedByte(); // L: 242 + this.contentType = var1.readUnsignedShort(); // L: 243 + this.rawX = var1.readShort(); // L: 244 + this.rawY = var1.readShort(); // L: 245 + this.rawWidth = var1.readUnsignedShort(); // L: 246 + this.rawHeight = var1.readUnsignedShort(); // L: 247 + this.transparencyTop = var1.readUnsignedByte(); // L: 248 + this.parentId = var1.readUnsignedShort(); // L: 249 + if (this.parentId == 65535) { // L: 250 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 251 } - this.mouseOverRedirect = var1.readUnsignedShort(); - if (this.mouseOverRedirect == 65535) { + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 252 + if (this.mouseOverRedirect == 65535) { // L: 253 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 254 int var3; - if (var2 > 0) { - this.cs1Comparisons = new int[var2]; - this.cs1ComparisonValues = new int[var2]; + if (var2 > 0) { // L: 255 + this.cs1Comparisons = new int[var2]; // L: 256 + this.cs1ComparisonValues = new int[var2]; // L: 257 - for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < var2; ++var3) { // L: 258 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 259 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 260 } } - var3 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); // L: 263 int var4; int var5; int var6; - if (var3 > 0) { - this.cs1Instructions = new int[var3][]; + if (var3 > 0) { // L: 264 + this.cs1Instructions = new int[var3][]; // L: 265 - for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.readUnsignedShort(); - this.cs1Instructions[var4] = new int[var5]; + for (var4 = 0; var4 < var3; ++var4) { // L: 266 + var5 = var1.readUnsignedShort(); // L: 267 + this.cs1Instructions[var4] = new int[var5]; // L: 268 - for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); - if (this.cs1Instructions[var4][var6] == 65535) { + for (var6 = 0; var6 < var5; ++var6) { // L: 269 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 270 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 271 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { - this.scrollHeight = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + if (this.type == 0) { // L: 275 + this.scrollHeight = var1.readUnsignedShort(); // L: 276 + this.isHidden = var1.readUnsignedByte() == 1; // L: 277 } - if (this.type == 1) { - var1.readUnsignedShort(); - var1.readUnsignedByte(); + if (this.type == 1) { // L: 279 + var1.readUnsignedShort(); // L: 280 + var1.readUnsignedByte(); // L: 281 } - if (this.type == 2) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - var4 = var1.readUnsignedByte(); - if (var4 == 1) { + if (this.type == 2) { // L: 283 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 284 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 285 + var4 = var1.readUnsignedByte(); // L: 286 + if (var4 == 1) { // L: 287 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); - if (var5 == 1) { + var5 = var1.readUnsignedByte(); // L: 288 + if (var5 == 1) { // L: 289 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); - if (var6 == 1) { + var6 = var1.readUnsignedByte(); // L: 290 + if (var6 == 1) { // L: 291 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); - if (var7 == 1) { + int var7 = var1.readUnsignedByte(); // L: 292 + if (var7 == 1) { // L: 293 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); - this.paddingY = var1.readUnsignedByte(); - this.inventoryXOffsets = new int[20]; - this.inventoryYOffsets = new int[20]; - this.inventorySprites = new int[20]; + this.paddingX = var1.readUnsignedByte(); // L: 294 + this.paddingY = var1.readUnsignedByte(); // L: 295 + this.inventoryXOffsets = new int[20]; // L: 296 + this.inventoryYOffsets = new int[20]; // L: 297 + this.inventorySprites = new int[20]; // L: 298 int var8; - 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(); + for (var8 = 0; var8 < 20; ++var8) { // L: 299 + int var11 = var1.readUnsignedByte(); // L: 300 + if (var11 == 1) { // L: 301 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 302 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 303 + this.inventorySprites[var8] = var1.readInt(); // L: 304 } else { - this.inventorySprites[var8] = -1; + this.inventorySprites[var8] = -1; // L: 306 } } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 308 - for (var8 = 0; var8 < 5; ++var8) { - String var9 = var1.readStringCp1252NullTerminated(); - if (var9.length() > 0) { - this.itemActions[var8] = var9; - this.flags |= 1 << var8 + 23; + for (var8 = 0; var8 < 5; ++var8) { // L: 309 + String var9 = var1.readStringCp1252NullTerminated(); // L: 310 + if (var9.length() > 0) { // L: 311 + this.itemActions[var8] = var9; // L: 312 + this.flags |= 1 << var8 + 23; // L: 313 } } } - if (this.type == 3) { - this.fill = var1.readUnsignedByte() == 1; + if (this.type == 3) { // L: 317 + this.fill = var1.readUnsignedByte() == 1; // L: 318 } - 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) { + if (this.type == 4 || this.type == 1) { // L: 320 + this.textXAlignment = var1.readUnsignedByte(); // L: 321 + this.textYAlignment = var1.readUnsignedByte(); // L: 322 + this.textLineHeight = var1.readUnsignedByte(); // L: 323 + this.fontId = var1.readUnsignedShort(); // L: 324 + if (this.fontId == 65535) { // L: 325 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; + this.textShadowed = var1.readUnsignedByte() == 1; // L: 326 } - if (this.type == 4) { - this.text = var1.readStringCp1252NullTerminated(); - this.text2 = var1.readStringCp1252NullTerminated(); + if (this.type == 4) { // L: 328 + this.text = var1.readStringCp1252NullTerminated(); // L: 329 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 330 } - if (this.type == 1 || this.type == 3 || this.type == 4) { + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 332 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { - this.color2 = var1.readInt(); - this.mouseOverColor = var1.readInt(); - this.mouseOverColor2 = var1.readInt(); + if (this.type == 3 || this.type == 4) { // L: 333 + this.color2 = var1.readInt(); // L: 334 + this.mouseOverColor = var1.readInt(); // L: 335 + this.mouseOverColor2 = var1.readInt(); // L: 336 } - if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteId = var1.readInt(); + if (this.type == 5) { // L: 338 + this.spriteId2 = var1.readInt(); // L: 339 + this.spriteId = var1.readInt(); // L: 340 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 342 + this.modelType = 1; // L: 343 + this.modelId = var1.readUnsignedShort(); // L: 344 + if (this.modelId == 65535) { // L: 345 this.modelId = -1; } - this.modelType2 = 1; - this.modelId2 = var1.readUnsignedShort(); - if (this.modelId2 == 65535) { + this.modelType2 = 1; // L: 346 + this.modelId2 = var1.readUnsignedShort(); // L: 347 + if (this.modelId2 == 65535) { // L: 348 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 65535) { + this.sequenceId = var1.readUnsignedShort(); // L: 349 + if (this.sequenceId == 65535) { // L: 350 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); - if (this.sequenceId2 == 65535) { + this.sequenceId2 = var1.readUnsignedShort(); // L: 351 + if (this.sequenceId2 == 65535) { // L: 352 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); // L: 353 + this.modelAngleX = var1.readUnsignedShort(); // L: 354 + this.modelAngleY = var1.readUnsignedShort(); // L: 355 } - if (this.type == 7) { - this.itemIds = new int[this.rawHeight * this.rawWidth]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 7) { // L: 357 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 358 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 359 + this.textXAlignment = var1.readUnsignedByte(); // L: 360 + this.fontId = var1.readUnsignedShort(); // L: 361 + if (this.fontId == 65535) { // L: 362 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); - this.paddingX = var1.readShort(); - this.paddingY = var1.readShort(); - var4 = var1.readUnsignedByte(); + this.textShadowed = var1.readUnsignedByte() == 1; // L: 363 + this.color = var1.readInt(); // L: 364 + this.paddingX = var1.readShort(); // L: 365 + this.paddingY = var1.readShort(); // L: 366 + var4 = var1.readUnsignedByte(); // L: 367 if (var4 == 1) { - this.flags |= 1073741824; + this.flags |= 1073741824; // L: 368 } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 369 - for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); - if (var10.length() > 0) { - this.itemActions[var5] = var10; - this.flags |= 1 << var5 + 23; + for (var5 = 0; var5 < 5; ++var5) { // L: 370 + String var10 = var1.readStringCp1252NullTerminated(); // L: 371 + if (var10.length() > 0) { // L: 372 + this.itemActions[var5] = var10; // L: 373 + this.flags |= 1 << var5 + 23; // L: 374 } } } - if (this.type == 8) { - this.text = var1.readStringCp1252NullTerminated(); + if (this.type == 8) { // L: 378 + this.text = var1.readStringCp1252NullTerminated(); // L: 379 } - 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 == 2 || this.type == 2) { // L: 381 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 382 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 383 + var4 = var1.readUnsignedShort() & 63; // L: 384 + this.flags |= var4 << 11; // L: 385 } - 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) { + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 387 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 388 + if (this.buttonText.length() == 0) { // L: 389 + if (this.buttonType == 1) { // L: 390 this.buttonText = "Ok"; } - if (this.buttonType == 4) { + if (this.buttonType == 4) { // L: 391 this.buttonText = "Select"; } - if (this.buttonType == 5) { + if (this.buttonType == 5) { // L: 392 this.buttonText = "Select"; } - if (this.buttonType == 6) { + if (this.buttonType == 6) { // L: 393 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { - this.flags |= 4194304; + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 396 + this.flags |= 4194304; // L: 397 } - if (this.buttonType == 6) { - this.flags |= 1; + if (this.buttonType == 6) { // L: 399 + this.flags |= 1; // L: 400 } - } + } // L: 402 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "1842256168" + descriptor = "(Lop;I)V", + garbageValue = "1242431249" ) @Export("decode") void decode(Buffer var1) { - 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) { + var1.readUnsignedByte(); // L: 405 + this.isIf3 = true; // L: 406 + this.type = var1.readUnsignedByte(); // L: 407 + this.contentType = var1.readUnsignedShort(); // L: 408 + this.rawX = var1.readShort(); // L: 409 + this.rawY = var1.readShort(); // L: 410 + this.rawWidth = var1.readUnsignedShort(); // L: 411 + if (this.type == 9) { // L: 412 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); // L: 413 } - 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.widthAlignment = var1.readByte(); // L: 414 + this.heightAlignment = var1.readByte(); // L: 415 + this.xAlignment = var1.readByte(); // L: 416 + this.yAlignment = var1.readByte(); // L: 417 + this.parentId = var1.readUnsignedShort(); // L: 418 + if (this.parentId == 65535) { // L: 419 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 420 } - this.isHidden = var1.readUnsignedByte() == 1; - if (this.type == 0) { - this.scrollWidth = var1.readUnsignedShort(); - this.scrollHeight = var1.readUnsignedShort(); - this.noClickThrough = var1.readUnsignedByte() == 1; + this.isHidden = var1.readUnsignedByte() == 1; // L: 421 + if (this.type == 0) { // L: 422 + this.scrollWidth = var1.readUnsignedShort(); // L: 423 + this.scrollHeight = var1.readUnsignedShort(); // L: 424 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 425 } - 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 == 5) { // L: 427 + this.spriteId2 = var1.readInt(); // L: 428 + this.spriteAngle = var1.readUnsignedShort(); // L: 429 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 430 + this.transparencyTop = var1.readUnsignedByte(); // L: 431 + this.outline = var1.readUnsignedByte(); // L: 432 + this.spriteShadow = var1.readInt(); // L: 433 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 434 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 435 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 437 + this.modelType = 1; // L: 438 + this.modelId = var1.readUnsignedShort(); // L: 439 + if (this.modelId == 65535) { // L: 440 this.modelId = -1; } - 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.modelOffsetX = var1.readShort(); // L: 441 + this.modelOffsetY = var1.readShort(); // L: 442 + this.modelAngleX = var1.readUnsignedShort(); // L: 443 + this.modelAngleY = var1.readUnsignedShort(); // L: 444 + this.modelAngleZ = var1.readUnsignedShort(); // L: 445 + this.modelZoom = var1.readUnsignedShort(); // L: 446 + this.sequenceId = var1.readUnsignedShort(); // L: 447 + if (this.sequenceId == 65535) { // L: 448 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; - var1.readUnsignedShort(); - if (this.widthAlignment != 0) { - this.field3102 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 449 + var1.readUnsignedShort(); // L: 450 + if (this.widthAlignment != 0) { // L: 451 + this.field3106 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { - var1.readUnsignedShort(); + if (this.heightAlignment != 0) { // L: 452 + var1.readUnsignedShort(); // L: 453 } } - if (this.type == 4) { - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 4) { // L: 456 + this.fontId = var1.readUnsignedShort(); // L: 457 + if (this.fontId == 65535) { // L: 458 this.fontId = -1; } - 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(); + this.text = var1.readStringCp1252NullTerminated(); // L: 459 + this.textLineHeight = var1.readUnsignedByte(); // L: 460 + this.textXAlignment = var1.readUnsignedByte(); // L: 461 + this.textYAlignment = var1.readUnsignedByte(); // L: 462 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 463 + this.color = var1.readInt(); // L: 464 } - if (this.type == 3) { - this.color = var1.readInt(); - this.fill = var1.readUnsignedByte() == 1; - this.transparencyTop = var1.readUnsignedByte(); + if (this.type == 3) { // L: 466 + this.color = var1.readInt(); // L: 467 + this.fill = var1.readUnsignedByte() == 1; // L: 468 + this.transparencyTop = var1.readUnsignedByte(); // L: 469 } - if (this.type == 9) { - this.lineWid = var1.readUnsignedByte(); - this.color = var1.readInt(); - this.field3081 = var1.readUnsignedByte() == 1; + if (this.type == 9) { // L: 471 + this.lineWid = var1.readUnsignedByte(); // L: 472 + this.color = var1.readInt(); // L: 473 + this.field3085 = var1.readUnsignedByte() == 1; // L: 474 } - this.flags = var1.readMedium(); - this.dataText = var1.readStringCp1252NullTerminated(); - int var2 = var1.readUnsignedByte(); - if (var2 > 0) { - this.actions = new String[var2]; + this.flags = var1.readMedium(); // L: 476 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 477 + int var2 = var1.readUnsignedByte(); // L: 478 + if (var2 > 0) { // L: 479 + this.actions = new String[var2]; // L: 480 - for (int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { // L: 481 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - 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); - } + this.dragZoneSize = var1.readUnsignedByte(); // L: 483 + this.dragThreshold = var1.readUnsignedByte(); // L: 484 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 485 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 486 + this.onLoad = this.readListener(var1); // L: 487 + this.onMouseOver = this.readListener(var1); // L: 488 + this.onMouseLeave = this.readListener(var1); // L: 489 + this.onTargetLeave = this.readListener(var1); // L: 490 + this.onTargetEnter = this.readListener(var1); // L: 491 + this.onVarTransmit = this.readListener(var1); // L: 492 + this.onInvTransmit = this.readListener(var1); // L: 493 + this.onStatTransmit = this.readListener(var1); // L: 494 + this.onTimer = this.readListener(var1); // L: 495 + this.onOp = this.readListener(var1); // L: 496 + this.onMouseRepeat = this.readListener(var1); // L: 497 + this.onClick = this.readListener(var1); // L: 498 + this.onClickRepeat = this.readListener(var1); // L: 499 + this.onRelease = this.readListener(var1); // L: 500 + this.onHold = this.readListener(var1); // L: 501 + this.onDrag = this.readListener(var1); // L: 502 + this.onDragComplete = this.readListener(var1); // L: 503 + this.onScroll = this.readListener(var1); // L: 504 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 505 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 506 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 507 + } // L: 508 - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lot;I)[Ljava/lang/Object;", - garbageValue = "-1513095431" + descriptor = "(Lop;I)[Ljava/lang/Object;", + garbageValue = "-866877812" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { + int var2 = var1.readUnsignedByte(); // L: 511 + if (var2 == 0) { // L: 512 return null; } else { - Object[] var3 = new Object[var2]; + Object[] var3 = new Object[var2]; // L: 513 - for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); + for (int var4 = 0; var4 < var2; ++var4) { // L: 514 + int var5 = var1.readUnsignedByte(); // L: 515 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); - } else if (var5 == 1) { + var3[var4] = new Integer(var1.readInt()); // L: 516 + } else if (var5 == 1) { // L: 517 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; - return var3; + this.hasListener = true; // L: 519 + return var3; // L: 520 } } - @ObfuscatedName("t") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lot;I)[I", - garbageValue = "998021667" + descriptor = "(Lop;B)[I", + garbageValue = "105" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { + int var2 = var1.readUnsignedByte(); // L: 524 + if (var2 == 0) { // L: 525 return null; } else { - int[] var3 = new int[var2]; + int[] var3 = new int[var2]; // L: 526 - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); + for (int var4 = 0; var4 < var2; ++var4) { // L: 527 + var3[var4] = var1.readInt(); // L: 528 } - return var3; + return var3; // L: 530 } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1136689238" + garbageValue = "657208411" ) @Export("swapItems") public void swapItems(int var1, int var2) { - 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; - } + int var3 = this.itemIds[var2]; // L: 534 + this.itemIds[var2] = this.itemIds[var1]; // L: 535 + this.itemIds[var1] = var3; // L: 536 + var3 = this.itemQuantities[var2]; // L: 537 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 538 + this.itemQuantities[var1] = var3; // L: 539 + } // L: 540 - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ZI)Lon;", - garbageValue = "-1235914295" + descriptor = "(ZB)Low;", + garbageValue = "-58" ) @Export("getSprite") public SpritePixels getSprite(boolean var1) { - field3045 = false; + field3049 = false; // L: 543 int var2; - if (var1) { + if (var1) { // L: 545 var2 = this.spriteId; } else { - var2 = this.spriteId2; + var2 = this.spriteId2; // L: 546 } - if (var2 == -1) { + if (var2 == -1) { // L: 547 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); - SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); - if (var5 != null) { + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 548 + SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 549 + if (var5 != null) { // L: 550 return var5; } else { - var5 = AccessFile.SpriteBuffer_getSprite(IntHashTable.Widget_spritesArchive, var2, 0); - if (var5 == null) { - field3045 = true; - return null; + var5 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapScaleHandler.Widget_spritesArchive, var2, 0); // L: 551 + if (var5 == null) { // L: 552 + field3049 = true; // L: 553 + return null; // L: 554 } else { - if (this.spriteFlipV) { + if (this.spriteFlipV) { // L: 556 var5.flipVertically(); } - if (this.spriteFlipH) { + if (this.spriteFlipH) { // L: 557 var5.flipHorizontally(); } - if (this.outline > 0) { + if (this.outline > 0) { // L: 558 var5.pad(this.outline); } - if (this.outline >= 1) { + if (this.outline >= 1) { // L: 559 var5.outline(1); } - if (this.outline >= 2) { + if (this.outline >= 2) { // L: 560 var5.outline(16777215); } - if (this.spriteShadow != 0) { + if (this.spriteShadow != 0) { // L: 561 var5.shadow(this.spriteShadow); } - Widget_cachedSprites.put(var5, var3); - return var5; + Widget_cachedSprites.put(var5, var3); // L: 562 + return var5; // L: 563 } } } } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1004805347" + descriptor = "(B)Lle;", + garbageValue = "96" ) @Export("getFont") public Font getFont() { - field3045 = false; - if (this.fontId == -1) { + field3049 = false; // L: 567 + if (this.fontId == -1) { // L: 568 return null; } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 569 + if (var1 != null) { // L: 570 return var1; } else { - var1 = Actor.method2153(IntHashTable.Widget_spritesArchive, SecureRandomFuture.Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = WorldMapScaleHandler.Widget_spritesArchive; // L: 572 + AbstractArchive var4 = class134.Widget_fontsArchive; // L: 573 + int var5 = this.fontId; // L: 574 + Font var2; + if (!BuddyRankComparator.method2502(var3, var5, 0)) { // L: 576 + var2 = null; // L: 577 } else { - field3045 = true; + byte[] var7 = var4.takeFile(var5, 0); // L: 581 + Font var6; + if (var7 == null) { // L: 583 + var6 = null; // L: 584 + } else { + Font var8 = new Font(var7, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, HitSplatDefinition.SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 587 + PacketBuffer.method6913(); // L: 588 + var6 = var8; // L: 589 + } + + var2 = var6; // L: 591 } - return var1; + if (var2 != null) { // L: 594 + Widget_cachedFonts.put(var2, (long)this.fontId); + } else { + field3049 = true; // L: 595 + } + + return var2; // L: 596 } } } @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)Lon;", - garbageValue = "-1032609925" + descriptor = "(II)Low;", + garbageValue = "-1869717535" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field3045 = false; - if (var1 >= 0 && var1 < this.inventorySprites.length) { - int var2 = this.inventorySprites[var1]; - if (var2 == -1) { + field3049 = false; // L: 600 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 601 + int var2 = this.inventorySprites[var1]; // L: 602 + if (var2 == -1) { // L: 603 return null; } else { - SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); - if (var3 != null) { + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 604 + if (var3 != null) { // L: 605 return var3; } else { - var3 = AccessFile.SpriteBuffer_getSprite(IntHashTable.Widget_spritesArchive, var2, 0); - if (var3 != null) { + var3 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapScaleHandler.Widget_spritesArchive, var2, 0); // L: 606 + if (var3 != null) { // L: 607 Widget_cachedSprites.put(var3, (long)var2); } else { - field3045 = true; + field3049 = true; // L: 608 } - return var3; + return var3; // L: 609 } } } else { @@ -1388,222 +1390,165 @@ public class Widget extends Node { } } - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lfe;IZLie;B)Lhl;", - garbageValue = "94" + descriptor = "(Lfm;IZLit;I)Lhl;", + garbageValue = "811469011" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3045 = false; + field3049 = false; // L: 613 int var5; int var6; - if (var3) { - var5 = this.modelType2; - var6 = this.modelId2; + if (var3) { // L: 616 + var5 = this.modelType2; // L: 617 + var6 = this.modelId2; // L: 618 } else { - var5 = this.modelType; - var6 = this.modelId; + var5 = this.modelType; // L: 621 + var6 = this.modelId; // L: 622 } - if (var5 == 0) { + if (var5 == 0) { // L: 624 return null; - } else if (var5 == 1 && var6 == -1) { + } else if (var5 == 1 && var6 == -1) { // L: 625 return null; } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); - if (var7 == null) { + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 626 + if (var7 == null) { // L: 627 ModelData var8; - if (var5 == 1) { - var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); - if (var8 == null) { - field3045 = true; - return null; + if (var5 == 1) { // L: 629 + var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 630 + if (var8 == null) { // L: 631 + field3049 = true; // L: 632 + return null; // L: 633 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 635 } - if (var5 == 2) { - var8 = class112.getNpcDefinition(var6).getModelData(); - if (var8 == null) { - field3045 = true; - return null; + if (var5 == 2) { // L: 637 + var8 = ScriptFrame.getNpcDefinition(var6).getModelData(); // L: 638 + if (var8 == null) { // L: 639 + field3049 = true; // L: 640 + return null; // L: 641 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 643 } - if (var5 == 3) { - if (var4 == null) { + if (var5 == 3) { // L: 645 + if (var4 == null) { // L: 646 return null; } - var8 = var4.getModelData(); - if (var8 == null) { - field3045 = true; - return null; + var8 = var4.getModelData(); // L: 647 + if (var8 == null) { // L: 648 + field3049 = true; // L: 649 + return null; // L: 650 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 652 } - if (var5 == 4) { - ItemComposition var9 = class87.ItemDefinition_get(var6); - var8 = var9.getModelData(10); - if (var8 == null) { - field3045 = true; - return null; + if (var5 == 4) { // L: 654 + ItemComposition var9 = TaskHandler.ItemDefinition_get(var6); // L: 655 + var8 = var9.getModelData(10); // L: 656 + if (var8 == null) { // L: 657 + field3049 = true; // L: 658 + return null; // L: 659 } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 661 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 663 } - if (var1 != null) { - var7 = var1.transformWidgetModel(var7, var2); + if (var1 != null) { // L: 665 + var7 = var1.transformWidgetModel(var7, var2); // L: 666 } - return var7; + return var7; // L: 668 } } - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(ZB)Liw;", - garbageValue = "103" + garbageValue = "-56" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { + if (this.spriteId == -1) { // L: 672 var1 = false; } - int var2 = var1 ? this.spriteId * -1158505479 * 805516873 : this.spriteId2 * -1605814115 * 1666649525; - if (var2 == -1) { + int var2 = var1 ? this.spriteId * -1784284609 * -1672153665 : this.spriteId2 * 1217109247 * 338387711; // L: 673 + if (var2 == -1) { // L: 674 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); // L: 675 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 676 + if (var5 != null) { // L: 677 return var5; } else { - SpritePixels var6 = this.getSprite(var1); - if (var6 == null) { + SpritePixels var6 = this.getSprite(var1); // L: 678 + if (var6 == null) { // L: 679 return null; } else { - SpritePixels var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; + SpritePixels var7 = var6.copyNormalized(); // L: 680 + int[] var8 = new int[var7.subHeight]; // L: 681 + int[] var9 = new int[var7.subHeight]; // L: 682 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 683 + int var11 = 0; // L: 684 + int var12 = var7.subWidth; // L: 685 int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var11 = var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 686 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 687 + var11 = var13; // L: 688 break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var12 = var13 + 1; + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 692 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 693 + var12 = var13 + 1; // L: 694 break; } } - var8[var10] = var11; - var9[var10] = var12 - var11; + var8[var10] = var11; // L: 698 + var9[var10] = var12 - var11; // L: 699 } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - Widget_cachedSpriteMasks.put(var5, var3); - return var5; + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 701 + Widget_cachedSpriteMasks.put(var5, var3); // L: 702 + return var5; // L: 703 } } } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-65" + garbageValue = "35" ) @Export("setAction") public void setAction(int var1, String var2) { - 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) { + if (this.actions == null || this.actions.length <= var1) { // L: 714 + String[] var3 = new String[var1 + 1]; // L: 715 + if (this.actions != null) { // L: 716 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 717 var3[var4] = this.actions[var4]; } } - this.actions = var3; + this.actions = var3; // L: 719 } - this.actions[var1] = var2; - } - - @ObfuscatedName("k") - public static int method5030(long var0) { - return (int)(var0 >>> 0 & 127L); - } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-790406239" - ) - static void method4997(int var0, int var1) { - int var2 = Interpreter.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var7 = Interpreter.fontBold12; - String var8; - if (var3 < 0) { - var8 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var8 = Client.menuActions[var3]; - } - - int var6 = var7.stringWidth(var8); - if (var6 > var2) { - var2 = var6; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var4 = var0 - var2 / 2; - if (var2 + var4 > Huffman.canvasWidth) { - var4 = Huffman.canvasWidth - var2; - } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = var1; - if (var3 + var1 > MouseRecorder.canvasHeight) { - var5 = MouseRecorder.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - LoginScreenAnimation.menuX = var4; - class392.menuY = var5; - UserComparator7.menuWidth = var2; - ApproximateRouteStrategy.menuHeight = Client.menuOptionsCount * 15 + 22; - } + this.actions[var1] = var2; // L: 721 + } // L: 722 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 9e339ed8f8..9ecf4e559a 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,344 +1,223 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bc") +@ObfuscatedName("bw") @Implements("World") public class World { - @ObfuscatedName("ss") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1010823159 - ) - static int field774; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -48833233 + intValue = -219608595 ) @Export("World_count") static int World_count; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2050249947 + intValue = -1277834635 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -86238293 + intValue = 695076639 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1958786797 + intValue = 1588910771 ) @Export("properties") int properties; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -538729111 + intValue = 284961543 ) @Export("population") int population; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("host") String host; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("activity") String activity; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 669690355 + intValue = 1851136007 ) @Export("location") int location; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 388841903 + intValue = -942792527 ) @Export("index") int index; static { - World_count = 0; - World_listCount = 0; - World_sortOption2 = new int[]{1, 1, 1, 1}; - World_sortOption1 = new int[]{0, 1, 2, 3}; + 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() { - } + } // L: 27 - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1340119949" + descriptor = "(B)Z", + garbageValue = "62" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; + return (1 & this.properties) != 0; // L: 257 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2012442922" + ) + boolean method1649() { + return (2 & this.properties) != 0; // L: 261 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "71" + ) + @Export("isPvp") + boolean isPvp() { + return (4 & this.properties) != 0; // L: 265 } @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" - ) - boolean method1592() { - return (2 & this.properties) != 0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-42" - ) - @Export("isPvp") - boolean isPvp() { - return (4 & this.properties) != 0; - } - - @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1652055615" + garbageValue = "-1239609040" ) - boolean method1594() { - return (8 & this.properties) != 0; + boolean method1681() { + return (8 & this.properties) != 0; // L: 269 } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "102" + garbageValue = "40" ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; + return (536870912 & this.properties) != 0; // L: 273 } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2054012301" + garbageValue = "1502884763" ) @Export("isBeta") boolean isBeta() { - return (33554432 & this.properties) != 0; + return (33554432 & this.properties) != 0; // L: 277 } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2055128830" + descriptor = "(B)Z", + garbageValue = "0" ) - boolean method1639() { - return (1073741824 & this.properties) != 0; + boolean method1652() { + return (1073741824 & this.properties) != 0; // L: 281 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lnj;", - garbageValue = "126" + descriptor = "(ILbp;ZI)I", + garbageValue = "-654094649" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { + static int method1668(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2062 + class14.Interpreter_intStackSize -= 2; // L: 2063 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2064 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2065 + EnumComposition var10 = FloorOverlayDefinition.getEnum(var3); // L: 2066 + if (var10.outputType != 's') { // L: 2067 } - } - String var4 = ""; - if (UserComparator10.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (UserComparator10.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(class272.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2068 + if (var9 == var10.keys[var6]) { // L: 2069 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2070 + var10 = null; // L: 2071 + break; + } } - } - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lbc;B)V", - garbageValue = "1" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - boolean var1 = var0.isMembersOnly(); - if (var1 != ItemComposition.ItemDefinition_inMembersWorld) { - WorldMapLabelSize.method3446(); - ItemComposition.ItemDefinition_inMembersWorld = var1; + if (var10 != null) { // L: 2075 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10.defaultStr; } - } - if (var0.properties != Client.worldProperties) { - Archive var3 = class176.archive8; - int var2 = var0.properties; - if ((var2 & 536870912) != 0) { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); - } else if ((var2 & 1073741824) != 0) { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); + return 1; // L: 2076 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2078 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2104 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2105 + EnumComposition var4 = FloorOverlayDefinition.getEnum(var3); // L: 2106 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.size(); // L: 2107 + return 1; // L: 2108 } else { - ClanChannelMember.logoSprite = class131.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); - } - } - - EnumComposition.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - WorldMapLabelSize.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - UserList.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - RouteStrategy.currentPort = WorldMapLabelSize.worldPort; - } - - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2015327255" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - class17.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - class17.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - class17.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - class112.method2474(3); - Login.field869 = 1; - } else if (var0 == 4) { - class112.method2474(14); - Login.field884 = 0; - } else if (var0 == 5) { - Login.field869 = 2; - class17.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)) { - if (var0 == 7) { - class17.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - class17.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - class17.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - class17.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - class17.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - class17.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - class17.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - class17.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - class17.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - class17.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - class112.method2474(14); - Login.field884 = 1; - } else if (var0 == 19) { - class17.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - class17.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - class17.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - class17.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - class17.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - class17.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - class17.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - class17.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - class17.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) { - class17.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) { - class17.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - class17.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - class112.method2474(8); - } else { - if (var0 == 56) { - class17.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - UserList.updateGameState(11); - return; - } - - if (var0 == 57) { - class17.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - UserList.updateGameState(11); - return; - } - - if (var0 == 61) { - class112.method2474(7); - } else { - if (var0 == 62) { - UserList.updateGameState(10); - class112.method2474(9); - class17.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); - return; - } - - if (var0 == 63) { - UserList.updateGameState(10); - class112.method2474(9); - class17.setLoginResponseString("You were signed out.", "Please sign in again.", ""); - return; - } - - if (var0 == 65 || var0 == 67) { - UserList.updateGameState(10); - class112.method2474(9); - class17.setLoginResponseString("Failed to login.", "Please try again.", ""); - return; - } - - class17.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } + return 2; // L: 2110 } } else { - class17.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } + class14.Interpreter_intStackSize -= 4; // L: 2079 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2080 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2081 + int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2082 + var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 2083 + EnumComposition var7 = FloorOverlayDefinition.getEnum(var5); // L: 2084 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2085 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2090 + if (var6 == var7.keys[var8]) { // L: 2091 + if (var9 == 115) { // L: 2092 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2093 + } - UserList.updateGameState(10); + var7 = null; // L: 2094 + break; + } + } + + if (var7 != null) { // L: 2098 + if (var9 == 115) { // L: 2099 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2100 + } + } + + return 1; // L: 2102 + } else { + if (var9 == 115) { // L: 2086 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2087 + } + + return 1; // L: 2088 + } + } } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 278cc361d8..7eeb286484 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,1470 +10,1433 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("ng") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lny;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lle;" ) @Export("font") Font font; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("fonts") HashMap fonts; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loe;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("c") + @ObfuscatedName("u") @Export("details") HashMap details; - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfb;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfb;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfb;" ) - WorldMapArea field4142; - @ObfuscatedName("z") + WorldMapArea field4145; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgv;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnl;" + descriptor = "Lnc;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1804193633 + intValue = 1290964243 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 387220207 + intValue = -204913467 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -664100075 + intValue = -1913333161 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1338319703 + intValue = 1159197949 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("zoom") float zoom; - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ad") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 644894367 + intValue = 1080910681 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 908037901 + intValue = 64732505 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1650801433 + intValue = -1230948931 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ah") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1752750559 + intValue = -17666691 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1482109167 + intValue = -923542465 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 301352235 + intValue = -939846439 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ao") + @ObfuscatedName("as") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 2024353507 + intValue = 1654296513 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1940197885 + intValue = 1442139175 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 453221207 + intValue = 1121026653 ) - int field4161; + int field4163; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -1594727553 + ) + int field4164; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1890358313 + intValue = -556014013 ) - int field4162; - @ObfuscatedName("ac") + int field4165; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1981724235 + intValue = 2105005049 ) - int field4156; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1473567095 - ) - int field4178; - @ObfuscatedName("ax") - @ObfuscatedGetter( - longValue = 4373694874656568459L - ) - long field4165; + int field4160; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 210082833 + longValue = 7665645789656802907L ) - int field4158; + long field4167; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = 1780442653 + ) + int field4169; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1533218575 + intValue = -576926271 ) - int field4167; + int field4148; @ObfuscatedName("ap") - boolean field4174; - @ObfuscatedName("aw") + boolean field4170; + @ObfuscatedName("af") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("az") + @ObfuscatedName("aw") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ae") + @ObfuscatedName("ao") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ai") - HashSet field4172; - @ObfuscatedName("af") + @ObfuscatedName("aa") + HashSet field4174; + @ObfuscatedName("ay") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = 186885757 - ) - int field4145; @ObfuscatedName("bg") + @ObfuscatedGetter( + intValue = -711279599 + ) + int field4135; + @ObfuscatedName("bx") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bf") - List field4137; - @ObfuscatedName("bj") + @ObfuscatedName("bd") + List field4178; + @ObfuscatedName("bt") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bo") - HashSet field4133; - @ObfuscatedName("bx") + @ObfuscatedName("bf") + HashSet field4180; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lie;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Low;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1762585281 + intValue = 768918845 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1694474829 + intValue = -400143741 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bv") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1353758785 + intValue = -1959278257 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1763412981 + intValue = -636170131 ) - int field4185; + int field4187; static { - fontNameVerdana11 = FontName.FontName_verdana11; - fontNameVerdana13 = FontName.FontName_verdana13; - fontNameVerdana15 = FontName.FontName_verdana15; + fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 + fontNameVerdana13 = FontName.FontName_verdana13; // L: 47 + fontNameVerdana15 = FontName.FontName_verdana15; // L: 48 } public WorldMap() { - 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.field4161 = -1; - this.field4162 = -1; - this.field4156 = -1; - this.field4178 = -1; - this.field4174 = true; - this.enabledElements = new HashSet(); - this.enabledCategories = new HashSet(); - this.enabledElementIds = new HashSet(); - this.field4172 = new HashSet(); - this.elementsDisabled = false; - this.field4145 = 0; - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4133 = new HashSet(); - this.mouseCoord = null; - this.showCoord = false; - this.minCachedTileX = -1; - this.minCachedTileY = -1; - this.field4185 = -1; + 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.field4163 = -1; // L: 74 + this.field4164 = -1; // L: 75 + this.field4165 = -1; // L: 76 + this.field4160 = -1; // L: 77 + this.field4170 = true; // L: 81 + this.enabledElements = new HashSet(); // L: 84 + this.enabledCategories = new HashSet(); // L: 85 + this.enabledElementIds = new HashSet(); // L: 86 + this.field4174 = new HashSet(); // L: 87 + this.elementsDisabled = false; // L: 88 + this.field4135 = 0; // L: 89 + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 + this.field4180 = 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.field4187 = -1; // L: 101 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;Lkl;Llt;Ljava/util/HashMap;[Loz;B)V", - garbageValue = "1" + descriptor = "(Lko;Lko;Lko;Lle;Ljava/util/HashMap;[Loe;B)V", + garbageValue = "105" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { - 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.field2220.name); - int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); - this.details = new HashMap(var8.length); + 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.field2210.name); // L: 115 + int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 + this.details = new HashMap(var8.length); // L: 117 - 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; + 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 } } - this.setCurrentMapArea(this.mainMapArea); - this.field4142 = null; - } + this.setCurrentMapArea(this.mainMapArea); // L: 127 + this.field4145 = null; // L: 128 + } // L: 129 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "390385509" + garbageValue = "-1459305380" ) - public void method6417() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); - } + public void method6487() { + class269.method5189(); // L: 132 + } // L: 133 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "958733854" + garbageValue = "1654773534" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { - this.smoothZoom(); - this.scrollToTarget(); - if (var3) { - int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method3698(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(); + if (this.cacheLoader.isLoaded()) { // L: 136 + this.smoothZoom(); // L: 139 + this.scrollToTarget(); // L: 140 + if (var3) { // L: 141 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145 + List var10 = this.worldMapManager.method3807(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 146 + HashSet var11 = new HashSet(); // L: 147 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); ViewportMouse.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.field4133.contains(var13)) { - var14.setType(17); + for (var12 = var10.iterator(); var12.hasNext(); Tile.runScriptEvent(var14)) { // L: 148 161 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 149 + var11.add(var13); // L: 151 + var14 = new ScriptEvent(); // L: 152 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 154 + if (this.field4180.contains(var13)) { // L: 155 + var14.setType(17); // L: 156 } else { - var14.setType(15); + var14.setType(15); // L: 159 } } - var12 = this.field4133.iterator(); + var12 = this.field4180.iterator(); // L: 164 while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); - if (!var11.contains(var13)) { - var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, var1, var2}); - var14.setType(16); - ViewportMouse.runScriptEvent(var14); + var13 = (AbstractWorldMapIcon)var12.next(); // L: 165 + if (!var11.contains(var13)) { // L: 167 + var14 = new ScriptEvent(); // L: 168 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 170 + var14.setType(16); // L: 171 + Tile.runScriptEvent(var14); // L: 172 } } - this.field4133 = var11; + this.field4180 = var11; // L: 176 } } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "1635651649" - ) - public void method6603(int var1, int var2, boolean var3, boolean var4) { - long var5 = UserComparator4.method2406(); - this.method6416(var1, var2, var4, var5); - if (this.hasTarget() || !var4 && !var3) { - this.method6420(); - } else { - if (var4) { - this.field4156 = var1; - this.field4178 = var2; - this.field4161 = this.centerTileX; - this.field4162 = this.centerTileY; - } - - if (this.field4161 != -1) { - int var7 = var1 - this.field4156; - int var8 = var2 - this.field4178; - this.setWorldMapPosition(this.field4161 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4162, false); - } - } - - if (var4) { - this.field4165 = var5; - this.field4158 = var1; - this.field4167 = var2; - } - - } - - @ObfuscatedName("m") - void method6416(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea != null) { - int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); - this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); - if (this.mouseCoord != null && var3) { - boolean var8 = Client.staffModLevel >= 2; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - UrlRequest.method2386(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); - } else { - boolean var9 = true; - if (this.field4174) { - int var10 = var1 - this.field4158; - int var11 = var2 - this.field4167; - if (var4 - this.field4165 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; - } - } - - if (var9) { - PacketBufferNode var12 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2737, Client.packetWriter.isaacCipher); - var12.packetBuffer.method6942(this.mouseCoord.packed()); - Client.packetWriter.addNode(var12); - this.field4165 = 0L; - } - } - } - } else { - this.mouseCoord = null; - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" - ) - @Export("smoothZoom") - void smoothZoom() { - if (Widget.field3165 != null) { - this.zoom = this.zoomTarget; - } else { - if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); - } - - if (this.zoom > this.zoomTarget) { - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); - } - - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-792242336" - ) - @Export("scrollToTarget") - void scrollToTarget() { - if (this.hasTarget()) { - int var1 = this.worldMapTargetX - this.centerTileX; - int var2 = this.worldMapTargetY - this.centerTileY; - if (var1 != 0) { - var1 /= Math.min(8, Math.abs(var1)); - } - - if (var2 != 0) { - var2 /= Math.min(8, Math.abs(var2)); - } - - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.centerTileX == this.worldMapTargetX && this.worldMapTargetY == this.centerTileY) { - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - } - - } - } + } // L: 137 142 177 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1606061078" + descriptor = "(IIZZI)V", + garbageValue = "701868023" ) - @Export("setWorldMapPosition") - final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; - this.centerTileY = var2; - UserComparator4.method2406(); - if (var3) { - this.method6420(); - } - - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - final void method6420() { - this.field4178 = -1; - this.field4156 = -1; - this.field4162 = -1; - this.field4161 = -1; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-56" - ) - @Export("hasTarget") - boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIII)Lfr;", - garbageValue = "247407740" - ) - @Export("mapAreaAtCoord") - public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); - - WorldMapArea var5; - do { - if (!var4.hasNext()) { - return null; + public void method6625(int var1, int var2, boolean var3, boolean var4) { + long var5 = class111.method2516(); // L: 180 + this.method6490(var1, var2, var4, var5); // L: 181 + if (this.hasTarget() || !var4 && !var3) { // L: 182 + this.method6624(); // L: 196 + } else { + if (var4) { // L: 183 + this.field4165 = var1; // L: 184 + this.field4160 = var2; // L: 185 + this.field4163 = this.centerTileX; // L: 186 + this.field4164 = this.centerTileY; // L: 187 } - var5 = (WorldMapArea)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); - - return var5; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "1" - ) - public void method6504(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); - if (var5 == null) { - if (!var4) { - return; + if (this.field4163 != -1) { // L: 189 + int var7 = var1 - this.field4165; // L: 190 + int var8 = var2 - this.field4160; // L: 191 + this.setWorldMapPosition(this.field4163 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4164, false); // L: 192 } - - var5 = this.mainMapArea; } - boolean var6 = false; - if (var5 != this.field4142 || var4) { - this.field4142 = var5; - this.setCurrentMapArea(var5); - var6 = true; + if (var4) { // L: 198 + this.field4167 = var5; // L: 199 + this.field4169 = var1; // L: 200 + this.field4148 = var2; // L: 201 } - if (var6 || var4) { - this.jump(var1, var2, var3); + } // L: 203 + + @ObfuscatedName("o") + void method6490(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 206 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209 + if (this.mouseCoord != null && var3) { // L: 210 + boolean var8 = Client.staffModLevel >= 2; // L: 213 + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215 + InvDefinition.method2986(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216 + } else { + boolean var9 = true; // L: 219 + if (this.field4170) { // L: 220 + int var10 = var1 - this.field4169; // L: 221 + int var11 = var2 - this.field4148; // L: 222 + if (var4 - this.field4167 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223 + var9 = false; // L: 224 + } + } + + if (var9) { // L: 227 + PacketBufferNode var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2720, Client.packetWriter.isaacCipher); // L: 228 + var12.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 229 + Client.packetWriter.addNode(var12); // L: 230 + this.field4167 = 0L; // L: 231 + } + } + } + } else { + this.mouseCoord = null; // L: 236 } - } + } // L: 237 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "784333548" + descriptor = "(I)V", + garbageValue = "735972697" ) - @Export("setCurrentMapAreaId") - public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); - if (var2 != null) { - this.setCurrentMapArea(var2); + @Export("smoothZoom") + void smoothZoom() { + if (ClanSettings.field1440 != null) { // L: 240 + this.zoom = this.zoomTarget; // L: 241 + } else { + if (this.zoom < this.zoomTarget) { // L: 244 + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 245 + } + + if (this.zoom > this.zoomTarget) { // L: 247 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248 + } + + } + } // L: 242 250 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1284753557" + ) + @Export("scrollToTarget") + void scrollToTarget() { + if (this.hasTarget()) { // L: 253 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 256 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 257 + if (var1 != 0) { // L: 258 + var1 /= Math.min(8, Math.abs(var1)); // L: 259 + } + + if (var2 != 0) { // L: 261 + var2 /= Math.min(8, Math.abs(var2)); // L: 262 + } + + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264 + if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { // L: 265 + this.worldMapTargetX = -1; // L: 266 + this.worldMapTargetY = -1; // L: 267 + } + + } + } // L: 254 269 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-1562100232" + ) + @Export("setWorldMapPosition") + final void setWorldMapPosition(int var1, int var2, boolean var3) { + this.centerTileX = var1; // L: 272 + this.centerTileY = var2; // L: 273 + class111.method2516(); // L: 274 + if (var3) { + this.method6624(); // L: 275 } - } + } // L: 276 - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-16104" + descriptor = "(I)V", + garbageValue = "-1517942634" ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)Lfr;", - garbageValue = "-80" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "-1169501828" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); - this.jump(-1, -1, -1); - } - } + final void method6624() { + this.field4160 = -1; // L: 279 + this.field4165 = -1; // L: 280 + this.field4164 = -1; // L: 281 + this.field4163 = -1; // L: 282 + } // L: 283 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "1799539764" + descriptor = "(S)Z", + garbageValue = "16912" ) - @Export("initializeWorldMapManager") - void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); - this.cacheLoader.reset(this.currentMapArea.getInternalName()); + @Export("hasTarget") + boolean hasTarget() { + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lfr;Lic;Lic;ZB)V", - garbageValue = "55" + descriptor = "(IIII)Lfb;", + garbageValue = "871893458" ) - public void method6537(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); + @Export("mapAreaAtCoord") + public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + Iterator var4 = this.details.values().iterator(); // L: 290 + + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; // L: 298 } - 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); - } + var5 = (WorldMapArea)var4.next(); // L: 291 + } while(!var5.containsCoord(var1, var2, var3)); // L: 293 - } + return var5; // L: 294 } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-19" + descriptor = "(IIIZI)V", + garbageValue = "2112775381" ) - @Export("jump") - void jump(int var1, int var2, int var3) { - 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()); + public void method6497(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302 + if (var5 == null) { // L: 303 + if (!var4) { // L: 304 + return; // L: 307 } - this.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.field4137 = null; - this.iconIterator = null; - this.worldMapManager.clearIcons(); - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "0" - ) - @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var6); - Rasterizer2D.Rasterizer2D_setClip(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()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); - if (!this.worldMapManager.isLoaded()) { - return; - } - } - - if (this.flashingElements != null) { - ++this.flashCycle; - if (this.flashCycle % this.cyclesPerFlash == 0) { - this.flashCycle = 0; - ++this.flashCount; - } - - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { - this.flashingElements = null; - } - } - - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); - this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); - boolean var10; - if (!this.elementsDisabled) { - var10 = false; - if (var5 - this.field4145 > 100) { - this.field4145 = 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.field4172, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); - } - - this.method6433(var1, var2, var3, var4, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); - } - - this.worldMapDisplayWidth = var8; - this.worldMapDisplayHeight = var9; - this.worldMapDisplayX = var1; - this.worldMapDisplayY = var2; - Rasterizer2D.Rasterizer2D_setClipArray(var6); - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "-634988882" - ) - boolean method6535(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { - return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { - return true; - } else if (this.field4185 != Client.field763) { - return true; - } else if (var3 <= 0 && var4 <= 0) { - return var3 + var1 < var5 || var2 + var4 < var6; - } else { - return true; - } - } else { - return true; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "45827893" - ) - void method6433(int var1, int var2, int var3, int var4, int var5, int var6) { - if (Widget.field3165 != 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 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6535(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); - } - - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - Widget.field3165.method5456(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4185 = Client.field763; - 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); - if (var10 == 1.0F) { - this.sprite.method7391(var13, var14, 192); - } else { - this.sprite.method7339(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); - } + var5 = this.mainMapArea; // L: 305 } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-106" - ) - @Export("drawOverview") - public void drawOverview(int var1, int var2, int var3, int var4) { - 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); + boolean var6 = false; // L: 309 + if (var5 != this.field4145 || var4) { // L: 310 + this.field4145 = var5; // L: 311 + this.setCurrentMapArea(var5); // L: 312 + var6 = true; // L: 313 } + + if (var6 || var4) { // L: 315 + this.jump(var1, var2, var3); // L: 316 + } + + } // L: 318 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1256555807" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 321 + if (var2 != null) { // L: 322 + this.setCurrentMapArea(var2); // L: 323 + } + + } // L: 325 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-27707" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331 } - @ObfuscatedName("n") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "29" + descriptor = "(I)Lfb;", + garbageValue = "-1826730666" ) - @Export("setZoomPercentage") - public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 335 } @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1366912184" + descriptor = "(Lfb;I)V", + garbageValue = "-1624305756" ) - @Export("drawLoading") - void drawLoading(int var1, int var2, int var3, int var4, int var5) { - 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); - } + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339 + this.initializeWorldMapManager(var1); // L: 342 + this.jump(-1, -1, -1); // L: 343 + } + } // L: 340 344 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lfb;B)V", + garbageValue = "-48" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 347 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349 + } // L: 350 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lfb;Lie;Lie;ZI)V", + garbageValue = "-1042330893" + ) + public void method6635(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 353 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356 + this.initializeWorldMapManager(var1); // L: 357 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359 + this.jump(var2.plane, var2.x, var2.y); // L: 363 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 360 + } + + } + } // L: 354 365 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "115" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 368 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371 + if (var4 == null) { // L: 372 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375 + this.worldMapTargetX = -1; // L: 376 + this.worldMapTargetY = -1; // L: 377 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378 + this.zoomTarget = this.zoom; // L: 379 + this.field4178 = null; // L: 380 + this.iconIterator = null; // L: 381 + this.worldMapManager.clearIcons(); // L: 382 + } + } // L: 369 383 @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-1602118418" + descriptor = "(IIIIII)V", + garbageValue = "1715999974" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 386 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 390 + if (var7 < 100) { // L: 391 + this.drawLoading(var1, var2, var3, var4, var7); // L: 392 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 395 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396 + if (!this.worldMapManager.isLoaded()) { // L: 397 + return; // L: 398 + } + } + + if (this.flashingElements != null) { // L: 401 + ++this.flashCycle; // L: 402 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403 + this.flashCycle = 0; // L: 404 + ++this.flashCount; // L: 405 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407 + this.flashingElements = null; // L: 408 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412 + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 413 + boolean var10; + if (!this.elementsDisabled) { // L: 414 + var10 = false; // L: 415 + if (var5 - this.field4135 > 100) { // L: 416 + this.field4135 = var5; // L: 417 + var10 = true; // L: 418 + } + + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4174, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420 + } + + this.method6507(var1, var2, var3, var4, var8, var9); // L: 422 + var10 = Client.staffModLevel >= 2; // L: 425 + if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 428 + this.worldMapDisplayHeight = var9; // L: 429 + this.worldMapDisplayX = var1; // L: 430 + this.worldMapDisplayY = var2; // L: 431 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432 + } + } // L: 393 433 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "-777808522" + ) + boolean method6506(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 436 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 438 + return true; + } else if (this.field4187 != Client.field742) { + return true; // L: 439 + } else if (var3 <= 0 && var4 <= 0) { // L: 440 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 441 + } else { + return true; // L: 442 + } + } else { + return true; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "1267878740" + ) + void method6507(int var1, int var2, int var3, int var4, int var5, int var6) { + if (ClanSettings.field1440 != null) { // L: 446 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447 + int var8 = var3 + 512; // L: 448 + int var9 = var4 + 512; // L: 449 + float var10 = 1.0F; // L: 450 + var8 = (int)((float)var8 / var10); // L: 451 + var9 = (int)((float)var9 / var10); // L: 452 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456 + if (this.method6506(var8, var9, var13, var14, var3, var4)) { // L: 457 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458 + Arrays.fill(this.sprite.pixels, 0); // L: 461 + } else { + this.sprite = new SpritePixels(var8, var9); // L: 459 + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464 + ClanSettings.field1440.method5491(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465 + this.field4187 = Client.field742; // L: 466 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468 + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470 + if (var10 == 1.0F) { // L: 471 + this.sprite.method7425(var13, var14, 192); // L: 472 + } else { + this.sprite.method7407(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 475 + } + } + + } // L: 478 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-718438952" + ) + @Export("drawOverview") + public void drawOverview(int var1, int var2, int var3, int var4) { + if (this.cacheLoader.isLoaded()) { // L: 481 + if (!this.worldMapManager.isLoaded()) { // L: 484 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485 + if (!this.worldMapManager.isLoaded()) { // L: 486 + return; // L: 487 + } + } + + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490 + } + } // L: 482 491 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "16711680" + ) + @Export("setZoomPercentage") + public void setZoomPercentage(int var1) { + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494 + } // L: 495 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "130628857" + ) + @Export("drawLoading") + void drawLoading(int var1, int var2, int var3, int var4, int var5) { + byte var6 = 20; // L: 498 + int var7 = var3 / 2 + var1; // L: 499 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 500 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503 + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 504 + } // L: 505 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)F", + garbageValue = "-89" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { + if (var1 == 25) { // L: 508 return 1.0F; - } else if (var1 == 37) { + } else if (var1 == 37) { // L: 509 return 1.5F; - } else if (var1 == 50) { + } else if (var1 == 50) { // L: 510 return 2.0F; - } else if (var1 == 75) { + } else if (var1 == 75) { // L: 511 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; + return var1 == 100 ? 4.0F : 8.0F; // L: 512 513 } } + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1576630654" + ) + @Export("getZoomLevel") + public int getZoomLevel() { + if ((double)this.zoomTarget == 1.0D) { // L: 517 + return 25; + } else if ((double)this.zoomTarget == 1.5D) { // L: 518 + return 37; + } else if (2.0D == (double)this.zoomTarget) { // L: 519 + return 50; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 520 + } else { + return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 521 522 + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "20" + ) + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); // L: 526 + } // L: 527 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "512" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); // L: 530 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)Lfb;", + garbageValue = "81" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 534 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; // L: 542 + } + + var3 = (WorldMapArea)var2.next(); // L: 535 + } while(var3.getId() != var1); // L: 537 + + return var3; // L: 538 + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1568968993" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550 + } + } // L: 547 551 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-218959360" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 554 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557 + this.worldMapTargetX = -1; // L: 558 + this.worldMapTargetY = -1; // L: 559 + } + } // L: 555 560 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-607717959" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 563 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566 + if (var4 != null) { // L: 567 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568 + } + + } + } // L: 564 570 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-1556827735" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 573 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576 + if (var4 != null) { // L: 577 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578 + } + + } + } // L: 574 580 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2141740850" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "201243175" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Lie;", + garbageValue = "-410448783" + ) + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600 + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "4" + ) + @Export("getDisplayWith") + public int getDisplayWith() { + return this.worldMapDisplayWidth; // L: 604 + } + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-596143702" + garbageValue = "486004290" ) - @Export("getZoomLevel") - public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { - return 25; - } else if (1.5D == (double)this.zoomTarget) { - return 37; - } else if ((double)this.zoomTarget == 2.0D) { - return 50; - } else if (3.0D == (double)this.zoomTarget) { - return 75; - } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; - } - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "234732097" - ) - @Export("loadCache") - public void loadCache() { - this.cacheLoader.load(); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1649343086" - ) - @Export("isCacheLoaded") - public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Lfr;", - garbageValue = "-896778798" - ) - @Export("getMapArea") - public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); - - WorldMapArea var3; - do { - if (!var2.hasNext()) { - return null; - } - - var3 = (WorldMapArea)var2.next(); - } while(var3.getId() != var1); - - return var3; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "402267396" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "35" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "764947840" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); - if (var4 != null) { - this.setWorldMapPositionTarget(var4[0], var4[1]); - } - - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-143624503" - ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); - if (var4 != null) { - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); - } - - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "255" - ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)Lic;", - garbageValue = "-1930969800" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-15228456" - ) - @Export("getDisplayWith") - public int getDisplayWith() { - return this.worldMapDisplayWidth; + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 608 } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-934855055" + descriptor = "(IB)V", + garbageValue = "-71" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { - if (var1 >= 1) { - this.maxFlashCount = var1; + if (var1 >= 1) { // L: 612 + this.maxFlashCount = var1; // L: 613 } - } + } // L: 615 - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1595551877" + descriptor = "(B)V", + garbageValue = "-41" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { - this.maxFlashCount = 3; - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "460269771" - ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { - this.cyclesPerFlash = var1; - } - - } + this.maxFlashCount = 3; // L: 618 + } // L: 619 @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "124" + descriptor = "(II)V", + garbageValue = "-1121589183" + ) + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 622 + this.cyclesPerFlash = var1; // L: 623 + } + + } // L: 625 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1682781705" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; - } + this.cyclesPerFlash = 50; // L: 628 + } // L: 629 @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-114" + garbageValue = "1" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; - } + this.perpetualFlash = var1; // L: 632 + } // L: 633 @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-1" + descriptor = "(II)V", + garbageValue = "-825195864" ) @Export("flashElement") public void flashElement(int var1) { - this.flashingElements = new HashSet(); - this.flashingElements.add(var1); - this.flashCount = 0; - this.flashCycle = 0; - } + this.flashingElements = new HashSet(); // L: 636 + this.flashingElements.add(var1); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + } // L: 640 - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "101" + garbageValue = "-7" ) @Export("flashCategory") public void flashCategory(int var1) { - this.flashingElements = new HashSet(); - this.flashCount = 0; - this.flashCycle = 0; + this.flashingElements = new HashSet(); // L: 643 + this.flashCount = 0; // L: 644 + this.flashCycle = 0; // L: 645 - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (class13.WorldMapElement_get(var2) != null && class13.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class13.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 646 + if (ItemComposition.WorldMapElement_get(var2) != null && ItemComposition.WorldMapElement_get(var2).category == var1) { // L: 647 650 + this.flashingElements.add(ItemComposition.WorldMapElement_get(var2).objectId); // L: 651 } } - } + } // L: 654 - @ObfuscatedName("am") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" + descriptor = "(I)V", + garbageValue = "1304327247" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { - this.flashingElements = null; - } + this.flashingElements = null; // L: 657 + } // L: 658 - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "123" + descriptor = "(ZI)V", + garbageValue = "1938764609" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; - } + this.elementsDisabled = !var1; // L: 661 + } // L: 662 - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "0" + garbageValue = "-115" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if (!var2) { - this.enabledElements.add(var1); + if (!var2) { // L: 665 + this.enabledElements.add(var1); // L: 666 } else { - this.enabledElements.remove(var1); + this.enabledElements.remove(var1); // L: 669 } - this.method6450(); - } + this.method6601(); // L: 671 + } // L: 672 - @ObfuscatedName("ae") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "-6" + garbageValue = "71" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { - this.enabledCategories.add(var1); + if (!var2) { // L: 675 + this.enabledCategories.add(var1); // L: 676 } else { - this.enabledCategories.remove(var1); + this.enabledCategories.remove(var1); // L: 679 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (class13.WorldMapElement_get(var3) != null && class13.WorldMapElement_get(var3).category == var1) { - int var4 = class13.WorldMapElement_get(var3).objectId; - if (!var2) { - this.enabledElementIds.add(var4); + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 681 + if (ItemComposition.WorldMapElement_get(var3) != null && ItemComposition.WorldMapElement_get(var3).category == var1) { // L: 682 685 + int var4 = ItemComposition.WorldMapElement_get(var3).objectId; // L: 686 + if (!var2) { // L: 687 + this.enabledElementIds.add(var4); // L: 688 } else { - this.enabledElementIds.remove(var4); + this.enabledElementIds.remove(var4); // L: 691 } } } - this.method6450(); - } + this.method6601(); // L: 695 + } // L: 696 - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2143225498" + garbageValue = "316140986" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; + return !this.elementsDisabled; // L: 699 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1533055134" + ) + @Export("isElementDisabled") + public boolean isElementDisabled(int var1) { + return !this.enabledElements.contains(var1); // L: 703 } @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "494628771" - ) - @Export("isElementDisabled") - public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); - } - - @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "0" + garbageValue = "42" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); + return !this.enabledCategories.contains(var1); // L: 707 } - @ObfuscatedName("bj") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-5" + garbageValue = "105" ) - void method6450() { - this.field4172.clear(); - this.field4172.addAll(this.enabledElements); - this.field4172.addAll(this.enabledElementIds); - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1990618851" - ) - @Export("addElementMenuOptions") - public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method3698(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); - if (!var9.isEmpty()) { - Iterator var10 = var9.iterator(); - - boolean var13; - do { - if (!var10.hasNext()) { - return; - } - - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class13.WorldMapElement_get(var11.getElement()); - var13 = false; - - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { - if (var12.menuActions[var14] != null) { - GameBuild.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); - var13 = true; - } - } - } while(!var13); - - } - } - } + void method6601() { + this.field4174.clear(); // L: 711 + this.field4174.addAll(this.enabledElements); // L: 712 + this.field4174.addAll(this.enabledElementIds); // L: 713 + } // L: 714 @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(ILic;I)Lic;", - garbageValue = "-594556597" + descriptor = "(IIIIIIB)V", + garbageValue = "90" ) - public Coord method6467(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { - return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { - return null; + @Export("addElementMenuOptions") + public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.cacheLoader.isLoaded()) { // L: 717 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721 + List var9 = this.worldMapManager.method3807(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 722 + if (!var9.isEmpty()) { // L: 723 + Iterator var10 = var9.iterator(); // L: 726 + + boolean var13; + do { + if (!var10.hasNext()) { // L: 741 + return; // L: 742 + } + + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727 + WorldMapElement var12 = ItemComposition.WorldMapElement_get(var11.getElement()); // L: 729 + var13 = false; // L: 730 + + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731 + if (var12.menuActions[var14] != null) { // L: 732 + EnumComposition.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733 + var13 = true; // L: 734 + } + } + } while(!var13); // L: 737 + + } + } + } // L: 718 724 738 + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ILie;I)Lie;", + garbageValue = "-2028190733" + ) + public Coord method6666(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 745 + return null; // L: 746 + } else if (!this.worldMapManager.isLoaded()) { // L: 748 + return null; // L: 749 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751 + return null; // L: 752 } else { - HashMap var3 = this.worldMapManager.buildIcons(); - List var4 = (List)var3.get(var1); - if (var4 != null && !var4.isEmpty()) { - AbstractWorldMapIcon var5 = null; - int var6 = -1; - Iterator var7 = var4.iterator(); + HashMap var3 = this.worldMapManager.buildIcons(); // L: 754 + List var4 = (List)var3.get(var1); // L: 755 + if (var4 != null && !var4.isEmpty()) { // L: 756 + AbstractWorldMapIcon var5 = null; // L: 759 + int var6 = -1; // L: 760 + Iterator var7 = var4.iterator(); // L: 761 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; + return var5.coord2; // L: 776 } - var8 = (AbstractWorldMapIcon)var7.next(); - int var9 = var8.coord2.x - var2.x; - int var10 = var8.coord2.y - var2.y; - var11 = var10 * var10 + var9 * var9; - if (var11 == 0) { - return var8.coord2; + var8 = (AbstractWorldMapIcon)var7.next(); // L: 762 + int var9 = var8.coord2.x - var2.x; // L: 764 + int var10 = var8.coord2.y - var2.y; // L: 765 + var11 = var10 * var10 + var9 * var9; // L: 766 + if (var11 == 0) { // L: 767 + return var8.coord2; // L: 768 } - } while(var11 >= var6 && var5 != null); + } while(var11 >= var6 && var5 != null); // L: 770 - var5 = var8; - var6 = var11; + var5 = var8; // L: 771 + var6 = var11; // L: 772 } } else { - return null; + return null; // L: 757 } } } - @ObfuscatedName("bu") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IILic;Lic;B)V", - garbageValue = "77" + descriptor = "(IILie;Lie;B)V", + garbageValue = "-122" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); - var5.setArgs(new Object[]{var6}); - switch(var1) { + ScriptEvent var5 = new ScriptEvent(); // L: 780 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781 + var5.setArgs(new Object[]{var6}); // L: 782 + switch(var1) { // L: 783 case 1008: - var5.setType(10); + var5.setType(10); // L: 786 break; case 1009: - var5.setType(11); + var5.setType(11); // L: 806 break; case 1010: - var5.setType(12); - break; + var5.setType(12); // L: 801 + break; // L: 802 case 1011: - var5.setType(13); - break; + var5.setType(13); // L: 796 + break; // L: 797 case 1012: - var5.setType(14); + var5.setType(14); // L: 791 } - ViewportMouse.runScriptEvent(var5); - } + Tile.runScriptEvent(var5); // L: 810 + } // L: 811 - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I)Lgz;", - garbageValue = "371732129" + descriptor = "(I)Lgm;", + garbageValue = "1362046793" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { - return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; + if (!this.cacheLoader.isLoaded()) { // L: 814 + return null; // L: 815 + } else if (!this.worldMapManager.isLoaded()) { // L: 817 + return null; // L: 818 } else { - HashMap var1 = this.worldMapManager.buildIcons(); - this.field4137 = new LinkedList(); - Iterator var2 = var1.values().iterator(); + HashMap var1 = this.worldMapManager.buildIcons(); // L: 820 + this.field4178 = new LinkedList(); // L: 821 + Iterator var2 = var1.values().iterator(); // L: 822 while (var2.hasNext()) { - List var3 = (List)var2.next(); - this.field4137.addAll(var3); + List var3 = (List)var2.next(); // L: 823 + this.field4178.addAll(var3); // L: 825 } - this.iconIterator = this.field4137.iterator(); - return this.iconNext(); + this.iconIterator = this.field4178.iterator(); // L: 828 + return this.iconNext(); // L: 829 } } - @ObfuscatedName("ba") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(I)Lgz;", - garbageValue = "-2143294057" + descriptor = "(I)Lgm;", + garbageValue = "1078265651" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { - return null; + if (this.iconIterator == null) { // L: 833 + return null; // L: 834 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { - return null; + if (!this.iconIterator.hasNext()) { // L: 836 + return null; // L: 842 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.getElement() == -1); + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837 + } while(var1.getElement() == -1); // L: 838 - return var1; + return var1; // L: 839 } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "1540528630" - ) - public static void method6612(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method6612(var0, var1, var2, var5 - 1); - method6612(var0, var1, var5 + 1, var3); - } - - } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 886a6953c1..9823234f38 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,106 +4,154 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") +@ObfuscatedName("nc") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("cacheName") String cacheName; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1838089259 + intValue = -1962849213 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lkl;)V" + descriptor = "(Lko;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { - this.percentLoaded = 0; - this.loaded = false; - this.archive = var1; - } + this.percentLoaded = 0; // L: 13 + this.loaded = false; // L: 14 + this.archive = var1; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1651193306" + garbageValue = "38129268" ) @Export("reset") void reset(String var1) { - if (var1 != null && !var1.isEmpty()) { - if (var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded = 0; - this.loaded = false; - this.load(); + 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 } } - } + } // L: 22 25 31 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2103125458" + garbageValue = "-1778196022" ) @Export("load") int load() { - if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2215.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded < 33) { // L: 34 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2211.name, this.cacheName)) { // L: 35 + return this.percentLoaded; // L: 36 } - this.percentLoaded = 33; + this.percentLoaded = 33; // L: 38 } - if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field2216.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2216.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded == 33) { // L: 40 + if (this.archive.isValidFileName(WorldMapCacheName.field2215.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2215.name, this.cacheName)) { // L: 41 42 + return this.percentLoaded; // L: 43 } - this.percentLoaded = 66; + this.percentLoaded = 66; // L: 46 } - if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2218.name)) { - return this.percentLoaded; + if (this.percentLoaded == 66) { // L: 48 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2214.name)) { // L: 49 + return this.percentLoaded; // L: 50 } - this.percentLoaded = 100; - this.loaded = true; + this.percentLoaded = 100; // L: 52 + this.loaded = true; // L: 53 } - return this.percentLoaded; + return this.percentLoaded; // L: 55 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1263221569" + descriptor = "(B)Z", + garbageValue = "6" ) @Export("isLoaded") boolean isLoaded() { - return this.loaded; + return this.loaded; // L: 59 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1014935859" + descriptor = "(B)I", + garbageValue = "21" ) @Export("getPercentLoaded") int getPercentLoaded() { - return this.percentLoaded; + return this.percentLoaded; // L: 63 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lbw;Lbw;IZB)I", + garbageValue = "36" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 221 + int var4 = var0.population; // L: 222 + int var5 = var1.population; // L: 223 + if (!var3) { // L: 224 + if (var4 == -1) { // L: 225 + var4 = 2001; + } + + if (var5 == -1) { // L: 226 + var5 = 2001; + } + } + + return var4 - var5; // L: 228 + } else if (var2 == 2) { // L: 230 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 231 + if (var0.activity.equals("-")) { // L: 232 + if (var1.activity.equals("-")) { // L: 233 + return 0; + } else { + return var3 ? -1 : 1; // L: 234 + } + } else if (var1.activity.equals("-")) { // L: 236 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 237 + } + } else if (var2 == 4) { // L: 239 + return var0.method1681() ? (var1.method1681() ? 0 : 1) : (var1.method1681() ? -1 : 0); + } else if (var2 == 5) { // L: 240 + return var0.method1649() ? (var1.method1649() ? 0 : 1) : (var1.method1649() ? -1 : 0); + } else if (var2 == 6) { // L: 241 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 242 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 243 + } } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index ca3c5b5b6d..f30ff38ef7 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -6,188 +6,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fb") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("gc") - @ObfuscatedGetter( - intValue = 334389247 + @ObfuscatedName("tr") + @ObfuscatedSignature( + descriptor = "Lmr;" ) - static int field2053; - @ObfuscatedName("l") + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1151523411 + intValue = -808178711 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("internalName") String internalName; - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("externalName") String externalName; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1870281145 + intValue = 819237223 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1005337785 + intValue = -755296395 ) @Export("zoom") int zoom; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lie;" ) @Export("origin") Coord origin; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2031091247 + intValue = -1548910029 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 237078907 + intValue = -79899971 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -992415669 + intValue = -619522771 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -94527557 + intValue = 156762923 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("isMain") boolean isMain; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("sections") LinkedList sections; public WorldMapArea() { - 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; + 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 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "-21" + descriptor = "(Lop;IB)V", + garbageValue = "-41" ) @Export("read") public void read(Buffer var1, int var2) { - 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(); + 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 - for (int var4 = 0; var4 < var3; ++var4) { - this.sections.add(this.readWorldMapSection(var1)); + for (int var4 = 0; var4 < var3; ++var4) { // L: 33 + this.sections.add(this.readWorldMapSection(var1)); // L: 34 } - this.setBounds(); - } + this.setBounds(); // L: 36 + } // L: 37 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;B)Lgl;", - garbageValue = "1" + descriptor = "(Lop;I)Lgx;", + garbageValue = "1722623204" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0}; - WorldMapSectionType var4 = (WorldMapSectionType)class128.findEnumerated(var3, var2); - Object var5 = null; - switch(var4.type) { + int var2 = var1.readUnsignedByte(); // L: 40 + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; // L: 43 + WorldMapSectionType var4 = (WorldMapSectionType)UserComparator4.findEnumerated(var3, var2); // L: 45 + Object var5 = null; // L: 46 + switch(var4.type) { // L: 47 case 0: - var5 = new class184(); + var5 = new class184(); // L: 60 break; case 1: - var5 = new WorldMapSection1(); + var5 = new WorldMapSection1(); // L: 49 break; case 2: - var5 = new WorldMapSection0(); - break; + var5 = new WorldMapSection2(); // L: 57 + break; // L: 58 case 3: - var5 = new WorldMapSection2(); - break; + var5 = new WorldMapSection0(); // L: 54 + break; // L: 55 default: - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 52 } - ((WorldMapSection)var5).read(var1); - return (WorldMapSection)var5; + ((WorldMapSection)var5).read(var1); // L: 63 + return (WorldMapSection)var5; // L: 64 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "668263956" + garbageValue = "-2062291574" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); + Iterator var4 = this.sections.iterator(); // L: 68 WorldMapSection var5; do { if (!var4.hasNext()) { - return false; + return false; // L: 76 } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); + var5 = (WorldMapSection)var4.next(); // L: 69 + } while(!var5.containsCoord(var1, var2, var3)); // L: 71 - return true; + return true; // L: 72 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1626377450" + descriptor = "(IIB)Z", + garbageValue = "-25" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - 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(); + int var3 = var1 / 64; // L: 80 + int var4 = var2 / 64; // L: 81 + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82 + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83 + Iterator var5 = this.sections.iterator(); // L: 84 WorldMapSection var6; do { if (!var5.hasNext()) { - return false; + return false; // L: 92 } - var6 = (WorldMapSection)var5.next(); - } while(!var6.containsPosition(var1, var2)); + var6 = (WorldMapSection)var5.next(); // L: 85 + } while(!var6.containsPosition(var1, var2)); // L: 87 - return true; + return true; // L: 88 } else { return false; } @@ -196,330 +197,220 @@ public class WorldMapArea { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1387557690" + descriptor = "(IIIB)[I", + garbageValue = "35" ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); + Iterator var4 = this.sections.iterator(); // L: 96 WorldMapSection var5; do { if (!var4.hasNext()) { - return null; + return null; // L: 104 } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); + var5 = (WorldMapSection)var4.next(); // L: 97 + } while(!var5.containsCoord(var1, var2, var3)); // L: 99 - return var5.getBorderTileLengths(var1, var2, var3); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "1153813181" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); - - WorldMapSection var4; - do { - if (!var3.hasNext()) { - return null; - } - - var4 = (WorldMapSection)var3.next(); - } while(!var4.containsPosition(var1, var2)); - - return var4.coord(var1, var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "557053872" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); - var2.expandBounds(this); - } - - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2094198480" - ) - @Export("getId") - public int getId() { - return this.id; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "13" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1549460192" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "539428715" - ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; + return var5.getBorderTileLengths(var1, var2, var3); // L: 100 } @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIB)Lie;", + garbageValue = "58" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + Iterator var3 = this.sections.iterator(); // L: 108 + + WorldMapSection var4; + do { + if (!var3.hasNext()) { + return null; // L: 116 + } + + var4 = (WorldMapSection)var3.next(); // L: 109 + } while(!var4.containsPosition(var1, var2)); // L: 111 + + return var4.coord(var1, var2); // L: 112 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1982690372" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 120 + + while (var1.hasNext()) { + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121 + var2.expandBounds(this); // L: 123 + } + + } // L: 126 + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-468887944" + garbageValue = "2147380047" + ) + @Export("getId") + public int getId() { + return this.id; // L: 129 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-60" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 133 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "0" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 137 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1017230656" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 141 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1217738287" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; // L: 145 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-438706152" ) @Export("getZoom") public int getZoom() { - return this.zoom; + return this.zoom; // L: 149 } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1837285801" + garbageValue = "-2116545091" ) @Export("getRegionLowX") public int getRegionLowX() { - return this.regionLowX; + return this.regionLowX; // L: 153 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "895947812" + descriptor = "(B)I", + garbageValue = "-12" ) @Export("getRegionHighX") public int getRegionHighX() { - return this.regionHighX; + return this.regionHighX; // L: 157 } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1917929622" + garbageValue = "-1073343926" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1966642948" + garbageValue = "-1503026192" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2055677745" + descriptor = "(S)I", + garbageValue = "-6358" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-15" + garbageValue = "43" ) @Export("getOriginPlane") public int getOriginPlane() { - return this.origin.plane; + return this.origin.plane; // L: 173 } - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1154509313" + garbageValue = "1994315244" ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; + return this.origin.y; // L: 177 } - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Lic;", - garbageValue = "-12" + descriptor = "(B)Lie;", + garbageValue = "90" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); + return new Coord(this.origin); // L: 181 } - @ObfuscatedName("gg") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ZLoy;I)V", - garbageValue = "-254909194" + descriptor = "(S)Loe;", + garbageValue = "-22529" ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - int var2 = var1.method6933(); - var3 = var1.readUnsignedShort(); - var4 = var1.readUnsignedShort(); - ModeWhere.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - ModeWhere.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class129.regions = new int[var4]; - Canvas.regionMapArchiveIds = new int[var4]; - GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds = new int[var4]; - class28.regionLandArchives = new byte[var4][]; - Client.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if (Client.field540) { - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { - var16 = true; - } - - if (var2 / 8 == 48 && var3 / 8 == 148) { - var16 = true; - } - } - - var4 = 0; - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { - var8 = var7 + (var6 << 8); - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { - class129.regions[var4] = var8; - Canvas.regionMapArchiveIds[var4] = ApproximateRouteStrategy.archive5.getGroupId("m" + var6 + "_" + var7); - GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var4] = ApproximateRouteStrategy.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - DesktopPlatformInfoProvider.method6380(var2, var3, true); - } else { - boolean var15 = var1.method6926() == 1; - var3 = var1.method6933(); - var4 = var1.readUnsignedShort(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - ModeWhere.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - ModeWhere.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class129.regions = new int[var5]; - Canvas.regionMapArchiveIds = new int[var5]; - GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds = new int[var5]; - class28.regionLandArchives = new byte[var5][]; - Client.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (class129.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class129.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - Canvas.regionMapArchiveIds[var5] = ApproximateRouteStrategy.archive5.getGroupId("m" + var13 + "_" + var14); - GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var5] = ApproximateRouteStrategy.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - DesktopPlatformInfoProvider.method6380(var4, var3, !var15); - } - + static IndexedSprite method3654() { + IndexedSprite var0 = new IndexedSprite(); // L: 159 + var0.width = class414.SpriteBuffer_spriteWidth; // L: 160 + var0.height = class414.SpriteBuffer_spriteHeight; // L: 161 + var0.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 162 + var0.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 163 + var0.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 164 + var0.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 165 + var0.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 166 + var0.pixels = class295.SpriteBuffer_pixels[0]; // L: 167 + PacketBuffer.method6913(); // L: 168 + return var0; // L: 169 } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index b3200a7dcd..2a35e52087 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -3,92 +3,85 @@ import java.util.LinkedList; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gj") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("tz") - @ObfuscatedGetter( - intValue = 1969439529 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("iconList") List iconList; WorldMapAreaData() { - } + } // L: 14 - @ObfuscatedName("cy") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(Lot;Lot;IZI)V", - garbageValue = "1114240184" + descriptor = "(Lop;Lop;IZB)V", + garbageValue = "0" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { - this.read(var1, var3); - int var5 = var2.readUnsignedShort(); - this.worldMapData0Set = new HashSet(var5); + this.read(var1, var3); // L: 17 + int var5 = var2.readUnsignedShort(); // L: 18 + this.worldMapData0Set = new HashSet(var5); // L: 19 int var6; - for (var6 = 0; var6 < var5; ++var6) { - WorldMapData_0 var7 = new WorldMapData_0(); + for (var6 = 0; var6 < var5; ++var6) { // L: 20 + WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 try { - var7.init(var2); - } catch (IllegalStateException var12) { - continue; + var7.init(var2); // L: 23 + } catch (IllegalStateException var12) { // L: 25 + continue; // L: 26 } - this.worldMapData0Set.add(var7); + this.worldMapData0Set.add(var7); // L: 28 } - var6 = var2.readUnsignedShort(); - this.worldMapData1Set = new HashSet(var6); + var6 = var2.readUnsignedShort(); // L: 30 + this.worldMapData1Set = new HashSet(var6); // L: 31 - for (int var10 = 0; var10 < var6; ++var10) { - WorldMapData_1 var8 = new WorldMapData_1(); + for (int var10 = 0; var10 < var6; ++var10) { // L: 32 + WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 try { - var8.init(var2); - } catch (IllegalStateException var11) { - continue; + var8.init(var2); // L: 35 + } catch (IllegalStateException var11) { // L: 37 + continue; // L: 38 } - this.worldMapData1Set.add(var8); + this.worldMapData1Set.add(var8); // L: 40 } - this.initIconsList(var2, var4); - } + this.initIconsList(var2, var4); // L: 42 + } // L: 43 - @ObfuscatedName("cg") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Lot;ZI)V", - garbageValue = "1360518712" + descriptor = "(Lop;ZI)V", + garbageValue = "1978597282" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); - int var3 = var1.readUnsignedShort(); + this.iconList = new LinkedList(); // L: 46 + int var3 = var1.readUnsignedShort(); // L: 47 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method6977(); - 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)); + for (int var4 = 0; var4 < var3; ++var4) { // L: 48 + int var5 = var1.method6946(); // 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 } } - } + } // L: 56 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 40519458d7..715b025267 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -3,53 +3,58 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gu") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgu;" ) - public static final WorldMapCacheName field2220; - @ObfuscatedName("q") + public static final WorldMapCacheName field2210; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgu;" + ) + public static final WorldMapCacheName field2211; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgu;" ) public static final WorldMapCacheName field2215; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgu;" ) - public static final WorldMapCacheName field2216; - @ObfuscatedName("j") + static final WorldMapCacheName field2213; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgu;" ) - static final WorldMapCacheName field2217; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgp;" - ) - public static final WorldMapCacheName field2218; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("k") + public static final WorldMapCacheName field2214; + @ObfuscatedName("g") @Export("name") public final String name; static { - field2220 = new WorldMapCacheName("details"); - field2215 = new WorldMapCacheName("compositemap"); - field2216 = new WorldMapCacheName("compositetexture"); - field2217 = new WorldMapCacheName("area"); - field2218 = new WorldMapCacheName("labels"); + field2210 = new WorldMapCacheName("details"); // L: 4 + field2211 = new WorldMapCacheName("compositemap"); // L: 5 + field2215 = new WorldMapCacheName("compositetexture"); // L: 6 + field2213 = new WorldMapCacheName("area"); // L: 7 + field2214 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { - this.name = var1; - } + this.name = var1; // L: 12 + } // L: 13 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "605723533" + ) + public static void method4027() { + class247.midiPcmStream.clear(); // L: 31 + class247.musicPlayerStatus = 1; // L: 32 + class128.musicTrackArchive = null; // L: 33 + } // L: 34 } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index e85eece283..a96c1baa6a 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,177 +3,213 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fv") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - WorldMapData_0() { - } - - @ObfuscatedName("l") + @ObfuscatedName("mu") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "7" + descriptor = "Ljf;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + + WorldMapData_0() { + } // L: 6 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;B)V", + garbageValue = "-38" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2195.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 9 + if (var2 != WorldMapID.field2186.value) { // L: 10 + throw new IllegalStateException(""); // L: 11 } else { - 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.method6977(); - super.fileId = var1.method6977(); + 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.method6946(); // L: 19 + super.fileId = var1.method6946(); // L: 20 } - } + } // L: 21 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "725648072" + descriptor = "(Lop;I)V", + garbageValue = "530647470" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); - super.floorUnderlayIds = new short[1][64][64]; - super.floorOverlayIds = new short[super.planes][64][64]; - super.field2155 = new byte[super.planes][64][64]; - super.field2149 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class194.field2189.value) { - throw new IllegalStateException(""); + super.planes = Math.min(super.planes, 4); // L: 24 + super.floorUnderlayIds = new short[1][64][64]; // L: 25 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 + super.field2154 = new byte[super.planes][64][64]; // L: 27 + super.field2145 = new byte[super.planes][64][64]; // L: 28 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 + int var2 = var1.readUnsignedByte(); // L: 30 + if (var2 != class194.field2177.value) { // L: 31 + throw new IllegalStateException(""); // L: 32 } else { - 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); + int var3 = var1.readUnsignedByte(); // L: 34 + int var4 = var1.readUnsignedByte(); // L: 35 + if (var3 == super.regionX && var4 == super.regionY) { // L: 36 + for (int var5 = 0; var5 < 64; ++var5) { // L: 39 + for (int var6 = 0; var6 < 64; ++var6) { // L: 40 + this.readTile(var5, var6, var1); // L: 41 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 37 } } - } + } // L: 44 public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { - return false; + if (!(var1 instanceof WorldMapData_0)) { // L: 47 + return false; // L: 48 } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; + WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 + return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 } } public int hashCode() { - return super.regionX | super.regionY << 8; + return super.regionX | super.regionY << 8; // L: 55 } - @ObfuscatedName("l") - public static double method3438(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); - } - - @ObfuscatedName("fz") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-509263629" + descriptor = "(Loj;II)Z", + garbageValue = "-2145762606" ) - static final void method3441() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var1 = Client.soundEffects[var0]; - if (var1 == null) { - Object var10000 = null; - var1 = SoundEffect.readSoundEffect(class260.archive4, Client.soundEffectIds[var0], 0); - if (var1 == null) { - continue; - } + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 539 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 540 + if (var0.readBits(1) != 0) { // L: 541 + updateExternalPlayer(var0, var1); + } - int[] var13 = Client.queuedSoundEffectDelays; - var13[var0] += var1.calculateDelay(); - Client.soundEffects[var0] = var1; - } + var3 = var0.readBits(13); // L: 542 + var4 = var0.readBits(13); // L: 543 + boolean var12 = var0.readBits(1) == 1; // L: 544 + if (var12) { // L: 545 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - class67.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - class67.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var7 + var5 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume / var3; - } else { - var2 = WorldMapDecorationType.clientPreferences.soundEffectsVolume; - } - - if (var2 > 0) { - RawSound var9 = var1.toRawSound().resample(RouteStrategy.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); - var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - ApproximateRouteStrategy.pcmStreamMixer.addSubStream(var10); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } + if (Client.players[var1] != null) { // L: 546 + throw new RuntimeException(); // L: 547 } else { - --Client.soundEffectCount; - - for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { - Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; - Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; - Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; - Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; - Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; + Player var11 = Client.players[var1] = new Player(); // L: 549 + var11.index = var1; // L: 550 + if (Players.field1242[var1] != null) { // L: 551 + var11.read(Players.field1242[var1]); } - --var0; + var11.orientation = Players.Players_orientations[var1]; // L: 552 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 553 + var7 = Players.Players_regions[var1]; // L: 554 + var8 = var7 >> 28; // L: 555 + var9 = var7 >> 14 & 255; // L: 556 + var10 = var7 & 255; // L: 557 + var11.pathTraversed[0] = Players.field1241[var1]; // L: 558 + var11.plane = (byte)var8; // L: 559 + var11.resetPath((var9 << 13) + var3 - class19.baseX, (var10 << 13) + var4 - DefaultsGroup.baseY); // L: 560 + var11.field1067 = false; // L: 561 + return true; // L: 562 + } + } else if (var2 == 1) { // L: 564 + var3 = var0.readBits(2); // L: 565 + var4 = Players.Players_regions[var1]; // L: 566 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 567 + return false; // L: 568 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 570 + var3 = var0.readBits(5); // L: 571 + var4 = var3 >> 3; // L: 572 + var5 = var3 & 7; // L: 573 + var6 = Players.Players_regions[var1]; // L: 574 + var7 = (var6 >> 28) + var4 & 3; // L: 575 + var8 = var6 >> 14 & 255; // L: 576 + var9 = var6 & 255; // L: 577 + if (var5 == 0) { // L: 578 + --var8; // L: 579 + --var9; // L: 580 + } + + if (var5 == 1) { // L: 582 + --var9; + } + + if (var5 == 2) { // L: 583 + ++var8; // L: 584 + --var9; // L: 585 + } + + if (var5 == 3) { // L: 587 + --var8; + } + + if (var5 == 4) { // L: 588 + ++var8; + } + + if (var5 == 5) { // L: 589 + --var8; // L: 590 + ++var9; // L: 591 + } + + if (var5 == 6) { // L: 593 + ++var9; + } + + if (var5 == 7) { // L: 594 + ++var8; // L: 595 + ++var9; // L: 596 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 598 + return false; // L: 599 + } else { + var3 = var0.readBits(18); // L: 601 + var4 = var3 >> 16; // L: 602 + var5 = var3 >> 8 & 255; // L: 603 + var6 = var3 & 255; // L: 604 + var7 = Players.Players_regions[var1]; // L: 605 + var8 = (var7 >> 28) + var4 & 3; // L: 606 + var9 = var5 + (var7 >> 14) & 255; // L: 607 + var10 = var6 + var7 & 255; // L: 608 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 609 + return false; // L: 610 } } + } - if (Client.field663) { - boolean var12; - if (class247.musicPlayerStatus != 0) { - var12 = true; - } else { - var12 = class247.midiPcmStream.isReady(); - } - - if (!var12) { - if (WorldMapDecorationType.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { - class67.method1886(Tiles.archive6, Client.currentTrackGroupId, 0, WorldMapDecorationType.clientPreferences.musicVolume, false); - } - - Client.field663 = false; - } + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1849354153" + ) + static int method3530(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 70 + if (var1 == null) { // L: 71 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 72 73 } - } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 68c9bec6f8..575a610388 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,168 +1,249 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gi") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1847575921 + intValue = 2132883567 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1386192995 + intValue = -1424345203 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 683382679 + intValue = -737589469 ) @Export("chunkX") int chunkX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2145976263 + intValue = -1977093803 ) @Export("chunkY") int chunkY; WorldMapData_1() { - } + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "-32" + descriptor = "(Lop;I)V", + garbageValue = "133240278" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2190.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 14 + if (var2 != WorldMapID.field2184.value) { // L: 15 + throw new IllegalStateException(""); // L: 16 } else { - 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.method6977(); - super.fileId = var1.method6977(); + 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.method6946(); // L: 28 + super.fileId = var1.method6946(); // L: 29 } - } + } // L: 30 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "725648072" + descriptor = "(Lop;I)V", + garbageValue = "530647470" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); - super.floorUnderlayIds = new short[1][64][64]; - super.floorOverlayIds = new short[super.planes][64][64]; - super.field2155 = new byte[super.planes][64][64]; - super.field2149 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class194.field2184.value) { - throw new IllegalStateException(""); + super.planes = Math.min(super.planes, 4); // L: 33 + super.floorUnderlayIds = new short[1][64][64]; // L: 34 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 + super.field2154 = new byte[super.planes][64][64]; // L: 36 + super.field2145 = new byte[super.planes][64][64]; // L: 37 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 != class194.field2178.value) { // L: 40 + throw new IllegalStateException(""); // L: 41 } else { - 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); + int var3 = var1.readUnsignedByte(); // L: 43 + int var4 = var1.readUnsignedByte(); // L: 44 + int var5 = var1.readUnsignedByte(); // L: 45 + int var6 = var1.readUnsignedByte(); // L: 46 + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47 + for (int var7 = 0; var7 < 8; ++var7) { // L: 50 + for (int var8 = 0; var8 < 8; ++var8) { // L: 51 + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 48 } } - } + } // L: 55 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-464773748" + descriptor = "(B)I", + garbageValue = "8" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; + return this.chunkXLow; // L: 73 } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-113" + descriptor = "(I)I", + garbageValue = "179463257" ) @Export("getChunkYLow") int getChunkYLow() { - return this.chunkYLow; + return this.chunkYLow; // L: 77 } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-53" + descriptor = "(I)I", + garbageValue = "1932347732" ) @Export("getChunkX") int getChunkX() { - return this.chunkX; + return this.chunkX; // L: 81 } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-674356349" + garbageValue = "-728228144" ) @Export("getChunkY") int getChunkY() { - return this.chunkY; + return this.chunkY; // L: 85 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { - return false; + if (!(var1 instanceof WorldMapData_1)) { // L: 58 + return false; // L: 59 } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { - return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; + WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 + if (super.regionX == var2.regionX && var2.regionY == super.regionY) { // L: 62 + return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; // L: 65 } else { - return false; + return false; // L: 63 } } } public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 } - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "913068963" + descriptor = "(I)V", + garbageValue = "1064426552" ) - public static int method3757(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } + static void method3844() { + try { + File var0 = new File(TriBool.userHomeDirectory, "random.dat"); // L: 248 + int var2; + if (var0.exists()) { // L: 249 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 250 + } else { + label38: + for (int var1 = 0; var1 < AbstractRasterProvider.cacheSubPaths.length; ++var1) { // L: 253 + for (var2 = 0; var2 < NPC.cacheParentPaths.length; ++var2) { // L: 254 + File var3 = new File(NPC.cacheParentPaths[var2] + AbstractRasterProvider.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 255 + if (var3.exists()) { // L: 256 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 257 + break label38; // L: 258 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 263 + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 264 + var2 = var4.read(); // L: 265 + var4.seek(0L); // L: 266 + var4.write(var2); // L: 267 + var4.seek(0L); // L: 268 + var4.close(); // L: 269 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 270 + } + } catch (IOException var5) { // L: 273 + } + + } // L: 274 + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1129195954" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1671 + if (Client.gameState == 0) { // L: 1672 + ArchiveLoader.client.method508(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1673 + UserComparator6.method2503(0); // L: 1674 + Client.field496 = 0; // L: 1675 + Client.field685 = 0; // L: 1676 + Client.timer.method5973(var0); // L: 1677 + if (var0 != 20) { // L: 1678 + WorldMapSection2.method3584(false); + } + } + + if (var0 != 20 && var0 != 40 && Projectile.field915 != null) { // L: 1680 1681 + Projectile.field915.close(); // L: 1682 + Projectile.field915 = null; // L: 1683 + } + + if (Client.gameState == 25) { // L: 1686 + Client.field485 = 0; // L: 1687 + Client.field521 = 0; // L: 1688 + Client.field522 = 1; // L: 1689 + Client.field523 = 0; // L: 1690 + Client.field524 = 1; // L: 1691 + } + + if (var0 != 5 && var0 != 10) { // L: 1693 + if (var0 == 20) { // L: 1701 + int var3 = Client.gameState == 11 ? 4 : 0; // L: 1702 + class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, true, var3); // L: 1703 + } else if (var0 == 11) { // L: 1705 + class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, false, 4); // L: 1706 + } else { + ArchiveDiskActionHandler.method5258(); // L: 1708 + } + } else { + boolean var1 = class408.clientPreferences.field1182 >= Client.field467; // L: 1696 + int var2 = var1 ? 0 : 12; // L: 1698 + class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, true, var2); // L: 1699 + } + + Client.gameState = var0; // L: 1709 + } + } // L: 1710 } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index dfeed97871..9971147b55 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,43 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gp") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljt;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "[Loz;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -86570713 + intValue = -1197653211 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 143955813 + intValue = -1466372567 ) @Export("decoration") final int decoration; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1572822193 + intValue = -1276630481 ) @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { - this.objectDefinitionId = var1; - this.decoration = var2; - this.rotation = var3; - } + this.objectDefinitionId = var1; // L: 9 + this.decoration = var2; // L: 10 + this.rotation = var3; // L: 11 + } // L: 12 + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(IIIILow;Liw;B)V", + garbageValue = "-5" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11738 + int var6 = Client.camAngleY & 2047; // L: 11739 + int var7 = var3 * var3 + var2 * var2; // L: 11740 + if (var7 <= 6400) { // L: 11741 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11742 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11743 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11744 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11745 + if (var7 > 2500) { + var4.method7410(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: 11746 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11747 + } + + } + } + } // L: 11748 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index e3fa44864f..7e471853aa 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,134 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jv") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements MouseWheel { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3245(0, 0), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3234(1, 0), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3227(2, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3228(3, 0), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3250(9, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3230(4, 1), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3249(5, 1), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3247(6, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3233(7, 1), @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3239(8, 1), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3235(12, 2), + field3238(0, 0), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3236(13, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3237(14, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3238(15, 2), + field3223(1, 0), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3225(16, 2), - @ObfuscatedName("c") + field3224(2, 0), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3240(17, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3241(18, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3242(19, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3243(20, 2), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3231(21, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - field3232(10, 2), + field3230(3, 0), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3246(11, 2), + field3231(9, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3227(4, 1), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3228(5, 1), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3240(6, 1), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3234(7, 1), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3229(8, 1), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3232(12, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3225(13, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3222(14, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3235(15, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3236(16, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3237(17, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3226(18, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3239(19, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3233(20, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3241(21, 2), @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljv;" ) - field3229(22, 3); - - @ObfuscatedName("tr") + field3242(10, 2), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lcq;" + descriptor = "Ljv;" ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("n") + field3243(11, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + field3244(22, 3); + + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1201425423 + intValue = -1784539249 ) @Export("id") public final int id; @@ -141,16 +135,25 @@ public enum WorldMapDecorationType implements MouseWheel { garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { - this.id = var3; - } + this.id = var3; // L: 34 + } // L: 35 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 38 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + static int method5193() { + return ++Messages.Messages_count - 1; // L: 19 } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index ff94c53dab..52b8ad74ef 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,334 +4,333 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("en") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Leo;" + descriptor = "[Len;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -880810839 + intValue = -1280320999 ) @Export("WorldMapElement_count") public static int WorldMapElement_count; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lig;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("hn") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 845293889 - ) - static int field1622; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 876781501 + intValue = 2056696763 ) @Export("objectId") public final int objectId; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1137753307 + intValue = -976227479 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1145388013 + intValue = -1158497187 ) @Export("sprite2") int sprite2; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1017200265 + intValue = 1157635857 ) - public int field1630; - @ObfuscatedName("i") + public int field1626; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 21450715 + intValue = 334109615 ) @Export("textSize") public int textSize; - @ObfuscatedName("w") - public boolean field1633; - @ObfuscatedName("g") - public boolean field1634; - @ObfuscatedName("v") + @ObfuscatedName("y") + public boolean field1641; + @ObfuscatedName("k") + public boolean field1629; + @ObfuscatedName("t") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("c") - int[] field1636; - @ObfuscatedName("b") + @ObfuscatedName("u") + int[] field1632; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 830800723 + intValue = 1219303973 ) - int field1638; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1146568603 - ) - int field1643; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -299465407 - ) - int field1640; + int field1633; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1865538037 + intValue = 1453776181 ) - int field1641; - @ObfuscatedName("h") + int field1634; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -526173565 + ) + int field1635; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2048716063 + ) + int field1621; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfj;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfg;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("r") - int[] field1644; - @ObfuscatedName("n") - byte[] field1645; - @ObfuscatedName("u") + @ObfuscatedName("c") + int[] field1636; + @ObfuscatedName("f") + byte[] field1638; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -729856873 + intValue = -1234093325 ) @Export("category") public int category; static { - WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); + WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } public WorldMapElement(int var1) { - this.sprite1 = -1; - this.sprite2 = -1; - this.textSize = 0; - this.field1633 = true; - this.field1634 = false; - this.menuActions = new String[5]; - this.field1638 = Integer.MAX_VALUE; - this.field1643 = Integer.MAX_VALUE; - this.field1640 = Integer.MIN_VALUE; - this.field1641 = Integer.MIN_VALUE; - this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; - this.category = -1; - this.objectId = var1; - } + this.sprite1 = -1; // L: 18 + this.sprite2 = -1; // L: 19 + this.textSize = 0; // L: 22 + this.field1641 = true; // L: 24 + this.field1629 = false; // L: 25 + this.menuActions = new String[5]; // L: 26 + this.field1633 = Integer.MAX_VALUE; // L: 29 + this.field1634 = Integer.MAX_VALUE; // L: 30 + this.field1635 = Integer.MIN_VALUE; // L: 31 + this.field1621 = Integer.MIN_VALUE; // L: 32 + this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 + this.category = -1; // L: 37 + this.objectId = var1; // L: 40 + } // L: 41 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "359574419" + descriptor = "(Lop;S)V", + garbageValue = "5756" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 52 + if (var2 == 0) { // L: 53 + return; // L: 56 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 54 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "371005915" + descriptor = "(Lop;IB)V", + garbageValue = "-64" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method6977(); - } else if (var2 == 2) { - this.sprite2 = var1.method6977(); - } else if (var2 == 3) { + if (var2 == 1) { // L: 59 + this.sprite1 = var1.method6946(); + } else if (var2 == 2) { // L: 60 + this.sprite2 = var1.method6946(); + } else if (var2 == 3) { // L: 61 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field1630 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { + } else if (var2 == 4) { // L: 62 + this.field1626 = var1.readMedium(); + } else if (var2 == 5) { // L: 63 + var1.readMedium(); // L: 64 + } else if (var2 == 6) { // L: 66 this.textSize = var1.readUnsignedByte(); } else { int var6; - if (var2 == 7) { - var6 = var1.readUnsignedByte(); - if ((var6 & 1) == 0) { - this.field1633 = false; + if (var2 == 7) { // L: 67 + var6 = var1.readUnsignedByte(); // L: 68 + if ((var6 & 1) == 0) { // L: 69 + this.field1641 = false; } - if ((var6 & 2) == 2) { - this.field1634 = true; + if ((var6 & 2) == 2) { // L: 70 + this.field1629 = true; } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { + } else if (var2 == 8) { // L: 72 + var1.readUnsignedByte(); // L: 73 + } else if (var2 >= 10 && var2 <= 14) { // L: 75 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - var6 = var1.readUnsignedByte(); - this.field1636 = new int[var6 * 2]; + } else if (var2 == 15) { // L: 76 + var6 = var1.readUnsignedByte(); // L: 77 + this.field1632 = new int[var6 * 2]; // L: 78 int var4; - for (var4 = 0; var4 < var6 * 2; ++var4) { - this.field1636[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 + this.field1632[var4] = var1.readShort(); } - var1.readInt(); - var4 = var1.readUnsignedByte(); - this.field1644 = new int[var4]; + var1.readInt(); // L: 80 + var4 = var1.readUnsignedByte(); // L: 81 + this.field1636 = new int[var4]; // L: 82 int var5; - for (var5 = 0; var5 < this.field1644.length; ++var5) { - this.field1644[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1636.length; ++var5) { // L: 83 + this.field1636[var5] = var1.readInt(); } - this.field1645 = new byte[var6]; + this.field1638 = new byte[var6]; // L: 84 - for (var5 = 0; var5 < var6; ++var5) { - this.field1645[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 85 + this.field1638[var5] = var1.readByte(); } - } else if (var2 != 16) { - if (var2 == 17) { + } else if (var2 != 16) { // L: 87 + if (var2 == 17) { // L: 88 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method6977(); - } else if (var2 == 19) { + } else if (var2 == 18) { // L: 89 + var1.method6946(); // L: 90 + } else if (var2 == 19) { // L: 92 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { - var1.readInt(); - } else if (var2 == 22) { - var1.readInt(); - } else if (var2 == 23) { - var1.readUnsignedByte(); - var1.readUnsignedByte(); - var1.readUnsignedByte(); - } else if (var2 == 24) { - var1.readShort(); - var1.readShort(); - } else if (var2 == 25) { - var1.method6977(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)class128.findEnumerated(PcmPlayer.method702(), var1.readUnsignedByte()); - } else if (var2 == 30) { - VerticalAlignment[] var3 = new VerticalAlignment[]{VerticalAlignment.field1747, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1748}; - this.verticalAlignment = (VerticalAlignment)class128.findEnumerated(var3, var1.readUnsignedByte()); + } 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.method6946(); // L: 109 + } else if (var2 == 28) { // L: 111 + var1.readUnsignedByte(); // L: 112 + } else if (var2 == 29) { // L: 114 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1699, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1694}; // L: 117 + this.horizontalAlignment = (HorizontalAlignment)UserComparator4.findEnumerated(var3, var1.readUnsignedByte()); // L: 119 + } else if (var2 == 30) { // L: 121 + this.verticalAlignment = (VerticalAlignment)UserComparator4.findEnumerated(class150.method2969(), var1.readUnsignedByte()); // L: 122 } } } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2056893790" + descriptor = "(B)V", + garbageValue = "-23" ) - public void method2900() { - if (this.field1636 != null) { - for (int var1 = 0; var1 < this.field1636.length; var1 += 2) { - if (this.field1636[var1] < this.field1638) { - this.field1638 = this.field1636[var1]; - } else if (this.field1636[var1] > this.field1640) { - this.field1640 = this.field1636[var1]; + public void method3008() { + if (this.field1632 != null) { + for (int var1 = 0; var1 < this.field1632.length; var1 += 2) { + if (this.field1632[var1] < this.field1633) { // L: 130 + this.field1633 = this.field1632[var1]; + } else if (this.field1632[var1] > this.field1635) { // L: 131 + this.field1635 = this.field1632[var1]; } - if (this.field1636[var1 + 1] < this.field1643) { - this.field1643 = this.field1636[var1 + 1]; - } else if (this.field1636[var1 + 1] > this.field1641) { - this.field1641 = this.field1636[var1 + 1]; + if (this.field1632[var1 + 1] < this.field1634) { // L: 132 + this.field1634 = this.field1632[var1 + 1]; + } else if (this.field1632[var1 + 1] > this.field1621) { + this.field1621 = this.field1632[var1 + 1]; // L: 133 } } } - } + } // L: 136 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZI)Lon;", - garbageValue = "-583562620" + descriptor = "(ZI)Low;", + garbageValue = "1908363794" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; - return this.getSprite(var2); + int var2 = this.sprite1; // L: 139 + return this.getSprite(var2); // L: 140 } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lon;", - garbageValue = "35" + descriptor = "(II)Low;", + garbageValue = "-834050600" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { + if (var1 < 0) { // L: 144 return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 145 + if (var2 != null) { // L: 146 return var2; } else { - var2 = AccessFile.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); + var2 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147 + if (var2 != null) { // L: 148 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 149 } - return var2; + return var2; // L: 151 } } } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-306914464" + garbageValue = "-1251139845" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; + return this.objectId; // L: 155 } - @ObfuscatedName("t") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1756483655" + descriptor = "(B)Z", + garbageValue = "72" ) - public static int method2922(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 124 + if (KeyHandler.field107 == KeyHandler.field131) { // L: 125 + return false; + } else { + class12.field55 = KeyHandler.field124[KeyHandler.field107]; // L: 126 + class319.field3858 = KeyHandler.field112[KeyHandler.field107]; // L: 127 + KeyHandler.field107 = KeyHandler.field107 + 1 & 127; // L: 128 + return true; // L: 129 + } } - - return var2; } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index a00e10bc54..a691f3b44b 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -3,112 +3,181 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gt") +@ObfuscatedName("gw") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("l") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lbw;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2131068137 + intValue = -370976069 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lie;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lie;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILic;Lic;)V" + descriptor = "(ILie;Lie;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { - this.mapElement = var1; - this.coord1 = var2; - this.coord2 = var3; - } + this.mapElement = var1; // L: 11 + this.coord1 = var2; // L: 12 + this.coord2 = var3; // L: 13 + } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "([BIIII[Lfy;I)V", - garbageValue = "-804986830" + descriptor = "(ILbp;ZB)I", + garbageValue = "3" ) - static final void method4018(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; + static int method4105(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 845 + Widget var4; + if (var0 >= 2000) { // L: 847 + var0 -= 1000; // L: 848 + var4 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 849 + var3 = false; // L: 850 + } else { + var4 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 852 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 853 + var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] - 1; // L: 854 + if (var11 >= 0 && var11 <= 9) { // L: 855 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 859 + return 1; // L: 860 + } else { + --class295.Interpreter_stringStackSize; // L: 856 + return 1; // L: 857 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 862 + class14.Interpreter_intStackSize -= 2; // L: 863 + var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 864 + var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 865 + var4.parent = ItemContainer.getWidgetChild(var11, var6); // L: 866 + return 1; // L: 867 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 869 + var4.isScrollBar = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 870 + return 1; // L: 871 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 873 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 874 + return 1; // L: 875 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 877 + var4.dragThreshold = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 878 + return 1; // L: 879 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 881 + var4.dataText = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 882 + return 1; // L: 883 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 885 + var4.spellActionName = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 886 + return 1; // L: 887 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 889 + var4.actions = null; // L: 890 + return 1; // L: 891 + } else if (var0 == 1308) { // L: 893 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 894 + return 1; // L: 895 + } else if (var0 == 1309) { // L: 897 + --class14.Interpreter_intStackSize; // L: 898 + return 1; // L: 899 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 901 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 931 + class14.Interpreter_intStackSize -= 2; // L: 932 + var5 = 10; // L: 933 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]}; // L: 934 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]}; // L: 935 + Varps.Widget_setKey(var4, var5, var8, var9); // L: 936 + return 1; // L: 937 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 939 + class14.Interpreter_intStackSize -= 3; // L: 940 + var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] - 1; // L: 941 + var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 942 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 943 + if (var11 >= 0 && var11 <= 9) { // L: 944 + Interpreter.Widget_setKeyRate(var4, var11, var6, var7); // L: 947 + return 1; // L: 948 + } else { + throw new RuntimeException(); // L: 945 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 950 + var5 = 10; // L: 951 + var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 952 + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 953 + Interpreter.Widget_setKeyRate(var4, var5, var6, var7); // L: 954 + return 1; // L: 955 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 957 + --class14.Interpreter_intStackSize; // L: 958 + var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] - 1; // L: 959 + if (var11 >= 0 && var11 <= 9) { // L: 960 + class1.Widget_setKeyIgnoreHeld(var4, var11); // L: 963 + return 1; // L: 964 + } else { + throw new RuntimeException(); // L: 961 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 966 + var5 = 10; // L: 967 + class1.Widget_setKeyIgnoreHeld(var4, var5); // L: 968 + return 1; // L: 969 + } else { + return 2; // L: 971 + } + } else { + byte[] var10 = null; // L: 902 + var8 = null; // L: 903 + if (var3) { // L: 904 + class14.Interpreter_intStackSize -= 10; // L: 905 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 907 908 + } + + if (var7 > 0) { // L: 910 + var10 = new byte[var7 / 2]; // L: 911 + var8 = new byte[var7 / 2]; // L: 912 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 913 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize]; // L: 914 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize + 1]; // L: 915 + } + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 920 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]}; // L: 921 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]}; // L: 922 + } + + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] - 1; // L: 924 + if (var7 >= 0 && var7 <= 9) { // L: 925 + Varps.Widget_setKey(var4, var7, var10, var8); // L: 928 + return 1; // L: 929 + } else { + throw new RuntimeException(); // L: 926 } } } } - - Buffer var10 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - VarpDefinition.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); - } - } - } - - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(Ljt;IIZB)V", - garbageValue = "1" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field3067 / var0.field3136; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field3136 / var0.field3067; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index b7d598c447..c5e230b01b 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,35 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("gz") @Implements("WorldMapID") public class WorldMapID { + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final WorldMapID field2186; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final WorldMapID field2184; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "[Lnw;" ) - static final WorldMapID field2195; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgm;" - ) - static final WorldMapID field2190; - @ObfuscatedName("t") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("f") + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1713675959 + intValue = 418528697 ) @Export("value") final int value; static { - field2195 = new WorldMapID(0); - field2190 = new WorldMapID(1); + field2186 = new WorldMapID(0); // L: 4 + field2184 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { - this.value = var1; - } + this.value = var1; // L: 9 + } // L: 10 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 201b4fa734..97c949a7f9 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,46 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gh") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("l") + @ObfuscatedName("fa") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1190804449 + intValue = 1687504305 ) @Export("element") final int element; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lga;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 511085029 + intValue = -515906735 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 139309099 + intValue = 724406877 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lic;Lic;ILga;)V" + descriptor = "(Lie;Lie;ILga;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { - super(var1, var2); - this.element = var3; - this.label = var4; - WorldMapElement var5 = class13.WorldMapElement_get(this.getElement()); - SpritePixels var6 = var5.getSpriteBool(false); - if (var6 != null) { - this.subWidth = var6.subWidth; - this.subHeight = var6.subHeight; + super(var1, var2); // L: 14 + this.element = var3; // L: 15 + this.label = var4; // L: 16 + WorldMapElement var5 = ItemComposition.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 } else { this.subWidth = 0; this.subHeight = 0; @@ -51,43 +60,89 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1329338621" + garbageValue = "-1660589105" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 30 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)Lga;", - garbageValue = "5309" + descriptor = "(B)Lga;", + garbageValue = "0" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 34 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1544604408" + garbageValue = "374350712" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 38 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "318612621" + garbageValue = "-1569056170" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; + return this.subHeight; // L: 42 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)Ljk;", + garbageValue = "1771772075" + ) + public static GameBuild method3890(int var0) { + GameBuild[] var1 = class245.method4742(); // L: 23 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 + GameBuild var3 = var1[var2]; // L: 25 + if (var0 == var3.buildId) { // L: 27 + return var3; + } + } + + return null; // L: 31 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-2005741653" + ) + static final int method3885(int var0, int var1) { + if (var0 == -2) { // L: 579 + return 12345678; + } else if (var0 == -1) { // L: 580 + if (var1 < 2) { + var1 = 2; // L: 581 + } else if (var1 > 126) { // L: 582 + var1 = 126; + } + + return var1; // L: 583 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 585 + if (var1 < 2) { // L: 586 + var1 = 2; + } else if (var1 > 126) { // L: 587 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 588 + } } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 528048d85f..2391006f27 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,157 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fr") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("po") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class387 HitSplatDefinition_cachedSprites; - @ObfuscatedName("iq") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -866840671 - ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1931079881 + intValue = -887698533 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lfk;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1125219351 + intValue = -1970765317 ) @Export("element") int element; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "Lga;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 866496065 + intValue = -609134761 ) @Export("subWidth") int subWidth; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1835416561 + intValue = -1799535623 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lic;Lic;ILfx;)V" + descriptor = "(Lie;Lie;ILfk;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { - super(var1, var2); - this.objectDefId = var3; - this.region = var4; - this.init(); - } + super(var1, var2); // L: 17 + this.objectDefId = var3; // L: 18 + this.region = var4; // L: 19 + this.init(); // L: 20 + } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-878538128" + garbageValue = "-1060359040" ) @Export("init") void init() { - this.element = class245.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class13.WorldMapElement_get(this.element)); - WorldMapElement var1 = class13.WorldMapElement_get(this.getElement()); - SpritePixels var2 = var1.getSpriteBool(false); - if (var2 != null) { - this.subWidth = var2.subWidth; - this.subHeight = var2.subHeight; + this.element = KitDefinition.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(ItemComposition.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = ItemComposition.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 } else { - this.subWidth = 0; - this.subHeight = 0; + this.subWidth = 0; // L: 33 + this.subHeight = 0; // L: 34 } - } + } // L: 36 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1329338621" + garbageValue = "-1660589105" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 39 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)Lga;", - garbageValue = "5309" + descriptor = "(B)Lga;", + garbageValue = "0" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 43 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1544604408" + garbageValue = "374350712" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 47 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "318612621" + garbageValue = "-1569056170" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IB)Ley;", - garbageValue = "49" - ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "273507297" - ) - static boolean method3461(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + return this.subHeight; // L: 51 } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 5d2c4f586d..2d00810257 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -7,42 +7,102 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ga") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("w") - public static short[][] field2180; - @ObfuscatedName("fg") - @ObfuscatedGetter( - intValue = 1364409407 - ) - static int field2176; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("text") String text; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -445350199 + intValue = 1596677031 ) @Export("width") int width; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 22712869 + intValue = 136381791 ) @Export("height") int height; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfo;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILfc;)V" + descriptor = "(Ljava/lang/String;IILfo;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { - this.text = var1; - this.width = var2; - this.height = var3; - this.size = var4; - } + this.text = var1; // L: 10 + this.width = var2; // L: 11 + this.height = var3; // L: 12 + this.size = var4; // L: 13 + } // L: 14 + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1622810143" + ) + static final void method3970() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 8002 + var0.importIndex(); // L: 8003 + int var1 = var0.readBits(8); // L: 8004 + int var2; + if (var1 < Client.npcCount) { // L: 8005 + for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 8006 + Client.field592[++Client.field591 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { // L: 8008 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 8009 + + for (var2 = 0; var2 < var1; ++var2) { // L: 8010 + int var3 = Client.npcIndices[var2]; // L: 8011 + NPC var4 = Client.npcs[var3]; // L: 8012 + int var5 = var0.readBits(1); // L: 8013 + if (var5 == 0) { // L: 8014 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8015 + var4.npcCycle = Client.cycle; // L: 8016 + } else { + int var6 = var0.readBits(2); // L: 8019 + if (var6 == 0) { // L: 8020 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8021 + var4.npcCycle = Client.cycle; // L: 8022 + Client.field513[++Client.field512 - 1] = var3; // L: 8023 + } else { + int var7; + int var8; + if (var6 == 1) { // L: 8026 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8027 + var4.npcCycle = Client.cycle; // L: 8028 + var7 = var0.readBits(3); // L: 8029 + var4.method2258(var7, (byte)1); // L: 8030 + var8 = var0.readBits(1); // L: 8031 + if (var8 == 1) { // L: 8032 + Client.field513[++Client.field512 - 1] = var3; + } + } else if (var6 == 2) { // L: 8035 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8036 + var4.npcCycle = Client.cycle; // L: 8037 + var7 = var0.readBits(3); // L: 8038 + var4.method2258(var7, (byte)2); // L: 8039 + var8 = var0.readBits(3); // L: 8040 + var4.method2258(var8, (byte)2); // L: 8041 + int var9 = var0.readBits(1); // L: 8042 + if (var9 == 1) { + Client.field513[++Client.field512 - 1] = var3; // L: 8043 + } + } else if (var6 == 3) { // L: 8046 + Client.field592[++Client.field591 - 1] = var3; // L: 8047 + } + } + } + } + + } + } // L: 8051 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index d5a3676f7a..675f329e6b 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,1162 +3,440 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fc") +@ObfuscatedName("fo") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfo;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfo;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfo;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("fi") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -493270791 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -153786259 - ) - final int field2012; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1953042663 + intValue = -55906983 ) final int field2014; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -635469781 + intValue = 1208925503 ) - final int field2010; + final int field2011; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1826409873 + ) + final int field2016; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); + 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(int var1, int var2, int var3) { - this.field2012 = var1; - this.field2014 = var2; - this.field2010 = var3; - } + this.field2014 = var1; // L: 15 + this.field2011 = var2; // L: 16 + this.field2016 = var3; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "1395291796" + garbageValue = "-2129729185" ) - boolean method3447(float var1) { - return var1 >= (float)this.field2010; + boolean method3533(float var1) { + return var1 >= (float)this.field2016; // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)Lem;", - garbageValue = "1099508444" + descriptor = "(II)Lfo;", + garbageValue = "-2058322957" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + static WorldMapLabelSize method3538(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 28 + WorldMapLabelSize[] var2 = var1; // L: 30 - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "31" - ) - public static void method3446() { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1948532333" - ) - static final void method3448() { - MouseRecorder.method2075(false); - Client.field764 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < class28.regionLandArchives.length; ++var1) { - if (Canvas.regionMapArchiveIds[var1] != -1 && class28.regionLandArchives[var1] == null) { - class28.regionLandArchives[var1] = ApproximateRouteStrategy.archive5.takeFile(Canvas.regionMapArchiveIds[var1], 0); - if (class28.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field764; - } - } - - if (GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var1] != -1 && Client.regionMapArchives[var1] == null) { - Client.regionMapArchives[var1] = ApproximateRouteStrategy.archive5.takeFileEncrypted(GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var1], 0, ModeWhere.xteaKeys[var1]); - if (Client.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field764; - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + WorldMapLabelSize var4 = var2[var3]; // L: 32 + if (var0 == var4.field2011) { // L: 34 + return var4; // L: 35 } } - if (!var0) { - Client.field534 = 1; + return null; // L: 40 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "0" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 216 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 217 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 218 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 219 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 220 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 221 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 222 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 223 + return Character.TYPE; } else { - Client.field545 = 0; - var0 = true; + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 224 225 + } + } - int var4; - int var57; - for (var1 = 0; var1 < class28.regionLandArchives.length; ++var1) { - byte[] var2 = Client.regionMapArchives[var1]; - if (var2 != null) { - var57 = (class129.regions[var1] >> 8) * 64 - WorldMapSectionType.baseX; - var4 = (class129.regions[var1] & 255) * 64 - PlayerComposition.baseY; - if (Client.isInInstance) { - var57 = 10; - var4 = 10; - } - - var0 &= class130.method2682(var2, var57, var4); - } - } - - if (!var0) { - Client.field534 = 2; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-2112381958" + ) + static int method3540(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 483 + class14.Interpreter_intStackSize -= 3; // L: 484 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 485 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 486 + int var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 487 + if (var4 == 0) { // L: 488 + throw new RuntimeException(); // L: 489 } else { - if (Client.field534 != 0) { - ScriptFrame.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + Widget var6 = UserComparator9.getWidget(var9); // L: 491 + if (var6.children == null) { // L: 492 + var6.children = new Widget[var11 + 1]; } - class356.playPcmPlayers(); - PlayerComposition.scene.clear(); + if (var6.children.length <= var11) { // L: 493 + Widget[] var7 = new Widget[var11 + 1]; // L: 494 - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 495 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 496 } - int var49; - for (var1 = 0; var1 < 4; ++var1) { - for (var49 = 0; var49 < 104; ++var49) { - for (var57 = 0; var57 < 104; ++var57) { - Tiles.Tiles_renderFlags[var1][var49][var57] = 0; - } - } - } - - class356.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.Tiles_underlays = new byte[4][104][104]; - Tiles.Tiles_overlays = new byte[4][104][104]; - class14.Tiles_shapes = new byte[4][104][104]; - GrandExchangeEvent.field3760 = new byte[4][104][104]; - Huffman.field3203 = new int[4][105][105]; - class281.field3323 = new byte[4][105][105]; - Tiles.field981 = new int[105][105]; - class11.Tiles_hue = new int[104]; - Tiles.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - Client.Tiles_hueMultiplier = new int[104]; - Tiles.field984 = new int[104]; - var1 = class28.regionLandArchives.length; - - for (ObjectSound var68 = (ObjectSound)ObjectSound.objectSounds.last(); var68 != null; var68 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var68.stream1 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var68.stream1); - var68.stream1 = null; - } - - if (var68.stream2 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var68.stream2); - var68.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - MouseRecorder.method2075(true); - int var5; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (!Client.isInInstance) { - byte[] var50; - for (var49 = 0; var49 < var1; ++var49) { - var57 = (class129.regions[var49] >> 8) * 64 - WorldMapSectionType.baseX; - var4 = (class129.regions[var49] & 255) * 64 - PlayerComposition.baseY; - var50 = class28.regionLandArchives[var49]; - if (var50 != null) { - class356.playPcmPlayers(); - WorldMapEvent.method4018(var50, var57, var4, HealthBarDefinition.field1671 * 8 - 48, WorldMapArea.field2053 * 8 - 48, Client.collisionMaps); - } - } - - for (var49 = 0; var49 < var1; ++var49) { - var57 = (class129.regions[var49] >> 8) * 64 - WorldMapSectionType.baseX; - var4 = (class129.regions[var49] & 255) * 64 - PlayerComposition.baseY; - var50 = class28.regionLandArchives[var49]; - if (var50 == null && WorldMapArea.field2053 < 800) { - class356.playPcmPlayers(); - MouseHandler.method586(var57, var4, 64, 64); - } - } - - MouseRecorder.method2075(true); - - for (var49 = 0; var49 < var1; ++var49) { - byte[] var3 = Client.regionMapArchives[var49]; - if (var3 != null) { - var4 = (class129.regions[var49] >> 8) * 64 - WorldMapSectionType.baseX; - var5 = (class129.regions[var49] & 255) * 64 - PlayerComposition.baseY; - class356.playPcmPlayers(); - Scene var64 = PlayerComposition.scene; - CollisionMap[] var65 = Client.collisionMaps; - Buffer var66 = new Buffer(var3); - var9 = -1; - - while (true) { - var10 = var66.method7037(); - if (var10 == 0) { - break; - } - - var9 += var10; - var11 = 0; - - while (true) { - var12 = var66.readUShortSmart(); - if (var12 == 0) { - break; - } - - var11 += var12 - 1; - var13 = var11 & 63; - var14 = var11 >> 6 & 63; - var15 = var11 >> 12; - var16 = var66.readUnsignedByte(); - var17 = var16 >> 2; - var18 = var16 & 3; - var19 = var14 + var4; - var20 = var13 + var5; - if (var19 > 0 && var20 > 0 && var19 < 103 && var20 < 103) { - var21 = var15; - if ((Tiles.Tiles_renderFlags[1][var19][var20] & 2) == 2) { - var21 = var15 - 1; - } - - CollisionMap var67 = null; - if (var21 >= 0) { - var67 = var65[var21]; - } - - class7.method64(var15, var19, var20, var9, var18, var17, var64, var67); - } - } - } - } - } - } - - int var6; - int var7; - int var8; - int[] var10000; - int var22; - int var23; - int var24; - int var25; - int var26; - int var27; - int var28; - int var29; - int var32; - int var33; - int var34; - int var35; - int var36; - int var41; - int var42; - int var43; - int var44; - int var45; - int var53; - int var54; - if (Client.isInInstance) { - CollisionMap[] var56; - Buffer var59; - for (var49 = 0; var49 < 4; ++var49) { - class356.playPcmPlayers(); - - for (var57 = 0; var57 < 13; ++var57) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var71 = false; - var6 = Client.instanceChunkTemplates[var49][var57][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var8 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < class129.regions.length; ++var12) { - if (class129.regions[var12] == var11 && class28.regionLandArchives[var12] != null) { - byte[] var63 = class28.regionLandArchives[var12]; - var14 = var57 * 8; - var15 = var4 * 8; - var16 = (var9 & 7) * 8; - var17 = (var10 & 7) * 8; - var56 = Client.collisionMaps; - - for (var19 = 0; var19 < 8; ++var19) { - for (var20 = 0; var20 < 8; ++var20) { - if (var14 + var19 > 0 && var14 + var19 < 103 && var15 + var20 > 0 && var20 + var15 < 103) { - var10000 = var56[var49].flags[var19 + var14]; - var10000[var20 + var15] &= -16777217; - } - } - } - - var59 = new Buffer(var63); - - for (var20 = 0; var20 < 4; ++var20) { - for (var21 = 0; var21 < 64; ++var21) { - for (var22 = 0; var22 < 64; ++var22) { - if (var20 == var7 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) { - VarpDefinition.loadTerrain(var59, var49, var14 + EnumComposition.method2998(var21 & 7, var22 & 7, var8), var15 + Canvas.method374(var21 & 7, var22 & 7, var8), 0, 0, var8); - } else { - VarpDefinition.loadTerrain(var59, 0, -1, -1, 0, 0, 0); - } - } - } - } - - var71 = true; - break; - } - } - } - - if (!var71) { - var7 = var49; - var8 = var57 * 8; - var9 = var4 * 8; - - for (var10 = 0; var10 < 8; ++var10) { - for (var11 = 0; var11 < 8; ++var11) { - Tiles.Tiles_heights[var7][var8 + var10][var9 + var11] = 0; - } - } - - if (var8 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var8][var10 + var9] = Tiles.Tiles_heights[var7][var8 - 1][var9 + var10]; - } - } - - if (var9 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var10 + var8][var9] = Tiles.Tiles_heights[var7][var8 + var10][var9 - 1]; - } - } - - if (var8 > 0 && Tiles.Tiles_heights[var7][var8 - 1][var9] != 0) { - Tiles.Tiles_heights[var7][var8][var9] = Tiles.Tiles_heights[var7][var8 - 1][var9]; - } else if (var9 > 0 && Tiles.Tiles_heights[var7][var8][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var8][var9] = Tiles.Tiles_heights[var7][var8][var9 - 1]; - } else if (var8 > 0 && var9 > 0 && Tiles.Tiles_heights[var7][var8 - 1][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var8][var9] = Tiles.Tiles_heights[var7][var8 - 1][var9 - 1]; - } - } - } - } - } - - for (var49 = 0; var49 < 13; ++var49) { - for (var57 = 0; var57 < 13; ++var57) { - var4 = Client.instanceChunkTemplates[0][var49][var57]; - if (var4 == -1) { - MouseHandler.method586(var49 * 8, var57 * 8, 8, 8); - } - } - } - - MouseRecorder.method2075(true); - - for (var49 = 0; var49 < 4; ++var49) { - class356.playPcmPlayers(); - - for (var57 = 0; var57 < 13; ++var57) { - label1200: - for (var4 = 0; var4 < 13; ++var4) { - var5 = Client.instanceChunkTemplates[var49][var57][var4]; - if (var5 != -1) { - var6 = var5 >> 24 & 3; - var7 = var5 >> 1 & 3; - var8 = var5 >> 14 & 1023; - var9 = var5 >> 3 & 2047; - var10 = (var8 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < class129.regions.length; ++var11) { - if (class129.regions[var11] == var10 && Client.regionMapArchives[var11] != null) { - byte[] var58 = Client.regionMapArchives[var11]; - var13 = var57 * 8; - var14 = var4 * 8; - var15 = (var8 & 7) * 8; - var16 = (var9 & 7) * 8; - Scene var55 = PlayerComposition.scene; - var56 = Client.collisionMaps; - var59 = new Buffer(var58); - var20 = -1; - - while (true) { - var21 = var59.method7037(); - if (var21 == 0) { - continue label1200; - } - - var20 += var21; - var22 = 0; - - while (true) { - var23 = var59.readUShortSmart(); - if (var23 == 0) { - break; - } - - var22 += var23 - 1; - var24 = var22 & 63; - var25 = var22 >> 6 & 63; - var26 = var22 >> 12; - var27 = var59.readUnsignedByte(); - var28 = var27 >> 2; - var29 = var27 & 3; - if (var26 == var6 && var25 >= var15 && var25 < var15 + 8 && var24 >= var16 && var24 < var16 + 8) { - ObjectComposition var60 = class245.getObjectDefinition(var20); - var33 = var25 & 7; - var34 = var24 & 7; - var36 = var60.sizeX; - int var61 = var60.sizeY; - if ((var29 & 1) == 1) { - var53 = var36; - var36 = var61; - var61 = var53; - } - - var35 = var7 & 3; - if (var35 == 0) { - var32 = var33; - } else if (var35 == 1) { - var32 = var34; - } else if (var35 == 2) { - var32 = 7 - var33 - (var36 - 1); - } else { - var32 = 7 - var34 - (var61 - 1); - } - - var53 = var13 + var32; - var41 = var25 & 7; - var42 = var24 & 7; - var44 = var60.sizeX; - var45 = var60.sizeY; - int var46; - if ((var29 & 1) == 1) { - var46 = var44; - var44 = var45; - var45 = var46; - } - - var43 = var7 & 3; - if (var43 == 0) { - var54 = var42; - } else if (var43 == 1) { - var54 = 7 - var41 - (var44 - 1); - } else if (var43 == 2) { - var54 = 7 - var42 - (var45 - 1); - } else { - var54 = var41; - } - - var46 = var54 + var14; - if (var53 > 0 && var46 > 0 && var53 < 103 && var46 < 103) { - int var47 = var49; - if ((Tiles.Tiles_renderFlags[1][var53][var46] & 2) == 2) { - var47 = var49 - 1; - } - - CollisionMap var48 = null; - if (var47 >= 0) { - var48 = var56[var47]; - } - - class7.method64(var49, var53, var46, var20, var29 + var7 & 3, var28, var55, var48); - } - } - } - } - } - } - } - } - } - } - } - - MouseRecorder.method2075(true); - class356.playPcmPlayers(); - Scene var69 = PlayerComposition.scene; - CollisionMap[] var70 = Client.collisionMaps; - - for (var4 = 0; var4 < 4; ++var4) { - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - if ((Tiles.Tiles_renderFlags[var4][var5][var6] & 1) == 1) { - var7 = var4; - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { - var7 = var4 - 1; - } - - if (var7 >= 0) { - var70[var7].setBlockedByFloor(var5, var6); - } - } - } - } - } - - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndHue < -8) { - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndLightness < -16) { - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { - Tiles.rndLightness = 16; - } - - for (var4 = 0; var4 < 4; ++var4) { - byte[][] var75 = class281.field3323[var4]; - var11 = (int)Math.sqrt(5100.0D); - var12 = var11 * 768 >> 8; - - for (var13 = 1; var13 < 103; ++var13) { - for (var14 = 1; var14 < 103; ++var14) { - var15 = Tiles.Tiles_heights[var4][var14 + 1][var13] - Tiles.Tiles_heights[var4][var14 - 1][var13]; - var16 = Tiles.Tiles_heights[var4][var14][var13 + 1] - Tiles.Tiles_heights[var4][var14][var13 - 1]; - var17 = (int)Math.sqrt((double)(var15 * var15 + var16 * var16 + 65536)); - var18 = (var15 << 8) / var17; - var19 = 65536 / var17; - var20 = (var16 << 8) / var17; - var21 = (var20 * -50 + var18 * -50 + var19 * -10) / var12 + 96; - var22 = (var75[var14][var13 + 1] >> 3) + (var75[var14 - 1][var13] >> 2) + (var75[var14][var13 - 1] >> 2) + (var75[var14 + 1][var13] >> 3) + (var75[var14][var13] >> 1); - Tiles.field981[var14][var13] = var21 - var22; - } - } - - for (var13 = 0; var13 < 104; ++var13) { - class11.Tiles_hue[var13] = 0; - Tiles.Tiles_saturation[var13] = 0; - Tiles.Tiles_lightness[var13] = 0; - Client.Tiles_hueMultiplier[var13] = 0; - Tiles.field984[var13] = 0; - } - - for (var13 = -5; var13 < 109; ++var13) { - for (var14 = 0; var14 < 104; ++var14) { - var15 = var13 + 5; - int var10002; - if (var15 >= 0 && var15 < 104) { - var16 = Tiles.Tiles_underlays[var4][var15][var14] & 255; - if (var16 > 0) { - FloorUnderlayDefinition var78 = HealthBar.method2214(var16 - 1); - var10000 = class11.Tiles_hue; - var10000[var14] += var78.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var14] += var78.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var14] += var78.lightness; - var10000 = Client.Tiles_hueMultiplier; - var10000[var14] += var78.hueMultiplier; - var10002 = Tiles.field984[var14]++; - } - } - - var16 = var13 - 5; - if (var16 >= 0 && var16 < 104) { - var17 = Tiles.Tiles_underlays[var4][var16][var14] & 255; - if (var17 > 0) { - FloorUnderlayDefinition var79 = HealthBar.method2214(var17 - 1); - var10000 = class11.Tiles_hue; - var10000[var14] -= var79.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var14] -= var79.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var14] -= var79.lightness; - var10000 = Client.Tiles_hueMultiplier; - var10000[var14] -= var79.hueMultiplier; - var10002 = Tiles.field984[var14]--; - } - } - } - - if (var13 >= 1 && var13 < 103) { - var14 = 0; - var15 = 0; - var16 = 0; - var17 = 0; - var18 = 0; - - for (var19 = -5; var19 < 109; ++var19) { - var20 = var19 + 5; - if (var20 >= 0 && var20 < 104) { - var14 += class11.Tiles_hue[var20]; - var15 += Tiles.Tiles_saturation[var20]; - var16 += Tiles.Tiles_lightness[var20]; - var17 += Client.Tiles_hueMultiplier[var20]; - var18 += Tiles.field984[var20]; - } - - var21 = var19 - 5; - if (var21 >= 0 && var21 < 104) { - var14 -= class11.Tiles_hue[var21]; - var15 -= Tiles.Tiles_saturation[var21]; - var16 -= Tiles.Tiles_lightness[var21]; - var17 -= Client.Tiles_hueMultiplier[var21]; - var18 -= Tiles.field984[var21]; - } - - if (var19 >= 1 && var19 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var13][var19] & 2) != 0 || (Tiles.Tiles_renderFlags[var4][var13][var19] & 16) == 0)) { - if (var4 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var4; - } - - var22 = Tiles.Tiles_underlays[var4][var13][var19] & 255; - var23 = Tiles.Tiles_overlays[var4][var13][var19] & 255; - if (var22 > 0 || var23 > 0) { - var24 = Tiles.Tiles_heights[var4][var13][var19]; - var25 = Tiles.Tiles_heights[var4][var13 + 1][var19]; - var26 = Tiles.Tiles_heights[var4][var13 + 1][var19 + 1]; - var27 = Tiles.Tiles_heights[var4][var13][var19 + 1]; - var28 = Tiles.field981[var13][var19]; - var29 = Tiles.field981[var13 + 1][var19]; - int var30 = Tiles.field981[var13 + 1][var19 + 1]; - int var31 = Tiles.field981[var13][var19 + 1]; - var32 = -1; - var33 = -1; - if (var22 > 0) { - var34 = var14 * 256 / var17; - var35 = var15 / var18; - var36 = var16 / var18; - var32 = NPCComposition.hslToRgb(var34, var35, var36); - var34 = var34 + Tiles.rndHue & 255; - var36 += Tiles.rndLightness; - if (var36 < 0) { - var36 = 0; - } else if (var36 > 255) { - var36 = 255; - } - - var33 = NPCComposition.hslToRgb(var34, var35, var36); - } - - FloorOverlayDefinition var37; - if (var4 > 0) { - boolean var73 = true; - if (var22 == 0 && class14.Tiles_shapes[var4][var13][var19] != 0) { - var73 = false; - } - - if (var23 > 0) { - var36 = var23 - 1; - var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36); - FloorOverlayDefinition var52; - if (var37 != null) { - var52 = var37; - } else { - byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36); - var37 = new FloorOverlayDefinition(); - if (var38 != null) { - var37.decode(new Buffer(var38), var36); - } - - var37.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36); - var52 = var37; - } - - if (!var52.hideUnderlay) { - var73 = false; - } - } - - if (var73 && var25 == var24 && var26 == var24 && var27 == var24) { - var10000 = Huffman.field3203[var4][var13]; - var10000[var19] |= 2340; - } - } - - var34 = 0; - if (var33 != -1) { - var34 = Rasterizer3D.Rasterizer3D_colorPalette[class128.method2663(var33, 96)]; - } - - if (var23 == 0) { - var69.addTile(var4, var13, var19, 0, 0, -1, var24, var25, var26, var27, class128.method2663(var32, var28), class128.method2663(var32, var29), class128.method2663(var32, var30), class128.method2663(var32, var31), 0, 0, 0, 0, var34, 0); - } else { - var35 = class14.Tiles_shapes[var4][var13][var19] + 1; - byte var74 = GrandExchangeEvent.field3760[var4][var13][var19]; - var53 = var23 - 1; - FloorOverlayDefinition var39 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var53); - if (var39 != null) { - var37 = var39; - } else { - byte[] var40 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var53); - var39 = new FloorOverlayDefinition(); - if (var40 != null) { - var39.decode(new Buffer(var40), var53); - } - - var39.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var39, (long)var53); - var37 = var39; - } - - var54 = var37.texture; - if (var54 >= 0) { - var42 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var54); - var41 = -1; - } else if (var37.primaryRgb == 16711935) { - var41 = -2; - var54 = -1; - var42 = -2; - } else { - var41 = NPCComposition.hslToRgb(var37.hue, var37.saturation, var37.lightness); - var43 = var37.hue + Tiles.rndHue & 255; - var44 = var37.lightness + Tiles.rndLightness; - if (var44 < 0) { - var44 = 0; - } else if (var44 > 255) { - var44 = 255; - } - - var42 = NPCComposition.hslToRgb(var43, var37.saturation, var44); - } - - var43 = 0; - if (var42 != -2) { - var43 = Rasterizer3D.Rasterizer3D_colorPalette[MouseHandler.method612(var42, 96)]; - } - - if (var37.secondaryRgb != -1) { - var44 = var37.secondaryHue + Tiles.rndHue & 255; - var45 = var37.secondaryLightness + Tiles.rndLightness; - if (var45 < 0) { - var45 = 0; - } else if (var45 > 255) { - var45 = 255; - } - - var42 = NPCComposition.hslToRgb(var44, var37.secondarySaturation, var45); - var43 = Rasterizer3D.Rasterizer3D_colorPalette[MouseHandler.method612(var42, 96)]; - } - - var69.addTile(var4, var13, var19, var35, var74, var54, var24, var25, var26, var27, class128.method2663(var32, var28), class128.method2663(var32, var29), class128.method2663(var32, var30), class128.method2663(var32, var31), MouseHandler.method612(var41, var28), MouseHandler.method612(var41, var29), MouseHandler.method612(var41, var30), MouseHandler.method612(var41, var31), var34, var43); - } - } - } - } - } - } - - for (var13 = 1; var13 < 103; ++var13) { - for (var14 = 1; var14 < 103; ++var14) { - if ((Tiles.Tiles_renderFlags[var4][var14][var13] & 8) != 0) { - var19 = 0; - } else if (var4 > 0 && (Tiles.Tiles_renderFlags[1][var14][var13] & 2) != 0) { - var19 = var4 - 1; - } else { - var19 = var4; - } - - var69.setTileMinPlane(var4, var14, var13, var19); - } - } - - Tiles.Tiles_underlays[var4] = null; - Tiles.Tiles_overlays[var4] = null; - class14.Tiles_shapes[var4] = null; - GrandExchangeEvent.field3760[var4] = null; - class281.field3323[var4] = null; - } - - var69.method4228(-50, -10, -50); - - for (var4 = 0; var4 < 104; ++var4) { - for (var5 = 0; var5 < 104; ++var5) { - if ((Tiles.Tiles_renderFlags[1][var4][var5] & 2) == 2) { - var69.setLinkBelow(var4, var5); - } - } - } - - var4 = 1; - var5 = 2; - var6 = 4; - - for (var7 = 0; var7 < 4; ++var7) { - if (var7 > 0) { - var4 <<= 3; - var5 <<= 3; - var6 <<= 3; - } - - for (var8 = 0; var8 <= var7; ++var8) { - for (var9 = 0; var9 <= 104; ++var9) { - for (var10 = 0; var10 <= 104; ++var10) { - short var72; - if ((Huffman.field3203[var8][var10][var9] & var4) != 0) { - var11 = var9; - var12 = var9; - var13 = var8; - - for (var14 = var8; var11 > 0 && (Huffman.field3203[var8][var10][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (Huffman.field3203[var8][var10][var12 + 1] & var4) != 0) { - ++var12; - } - - label928: - while (var13 > 0) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((Huffman.field3203[var13 - 1][var10][var15] & var4) == 0) { - break label928; - } - } - - --var13; - } - - label917: - while (var14 < var7) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((Huffman.field3203[var14 + 1][var10][var15] & var4) == 0) { - break label917; - } - } - - ++var14; - } - - var15 = (var12 - var11 + 1) * (var14 + 1 - var13); - if (var15 >= 8) { - var72 = 240; - var17 = Tiles.Tiles_heights[var14][var10][var11] - var72; - var18 = Tiles.Tiles_heights[var13][var10][var11]; - Scene.Scene_addOccluder(var7, 1, var10 * 128, var10 * 128, var11 * 128, var12 * 128 + 128, var17, var18); - - for (var19 = var13; var19 <= var14; ++var19) { - for (var20 = var11; var20 <= var12; ++var20) { - var10000 = Huffman.field3203[var19][var10]; - var10000[var20] &= ~var4; - } - } - } - } - - if ((Huffman.field3203[var8][var10][var9] & var5) != 0) { - var11 = var10; - var12 = var10; - var13 = var8; - - for (var14 = var8; var11 > 0 && (Huffman.field3203[var8][var11 - 1][var9] & var5) != 0; --var11) { - } - - while (var12 < 104 && (Huffman.field3203[var8][var12 + 1][var9] & var5) != 0) { - ++var12; - } - - label981: - while (var13 > 0) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((Huffman.field3203[var13 - 1][var15][var9] & var5) == 0) { - break label981; - } - } - - --var13; - } - - label970: - while (var14 < var7) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((Huffman.field3203[var14 + 1][var15][var9] & var5) == 0) { - break label970; - } - } - - ++var14; - } - - var15 = (var12 - var11 + 1) * (var14 + 1 - var13); - if (var15 >= 8) { - var72 = 240; - var17 = Tiles.Tiles_heights[var14][var11][var9] - var72; - var18 = Tiles.Tiles_heights[var13][var11][var9]; - Scene.Scene_addOccluder(var7, 2, var11 * 128, var12 * 128 + 128, var9 * 128, var9 * 128, var17, var18); - - for (var19 = var13; var19 <= var14; ++var19) { - for (var20 = var11; var20 <= var12; ++var20) { - var10000 = Huffman.field3203[var19][var20]; - var10000[var9] &= ~var5; - } - } - } - } - - if ((Huffman.field3203[var8][var10][var9] & var6) != 0) { - var11 = var10; - var12 = var10; - var13 = var9; - - for (var14 = var9; var13 > 0 && (Huffman.field3203[var8][var10][var13 - 1] & var6) != 0; --var13) { - } - - while (var14 < 104 && (Huffman.field3203[var8][var10][var14 + 1] & var6) != 0) { - ++var14; - } - - label1034: - while (var11 > 0) { - for (var15 = var13; var15 <= var14; ++var15) { - if ((Huffman.field3203[var8][var11 - 1][var15] & var6) == 0) { - break label1034; - } - } - - --var11; - } - - label1023: - while (var12 < 104) { - for (var15 = var13; var15 <= var14; ++var15) { - if ((Huffman.field3203[var8][var12 + 1][var15] & var6) == 0) { - break label1023; - } - } - - ++var12; - } - - if ((var14 - var13 + 1) * (var12 - var11 + 1) >= 4) { - var15 = Tiles.Tiles_heights[var8][var11][var13]; - Scene.Scene_addOccluder(var7, 4, var11 * 128, var12 * 128 + 128, var13 * 128, var14 * 128 + 128, var15, var15); - - for (var16 = var11; var16 <= var12; ++var16) { - for (var17 = var13; var17 <= var14; ++var17) { - var10000 = Huffman.field3203[var8][var16]; - var10000[var17] &= ~var6; - } - } - } - } - } - } - } - } - - MouseRecorder.method2075(true); - var4 = Tiles.Tiles_minPlane; - if (var4 > VertexNormal.Client_plane) { - var4 = VertexNormal.Client_plane; - } - - if (var4 < VertexNormal.Client_plane - 1) { - var4 = VertexNormal.Client_plane - 1; - } - - if (Client.isLowDetail) { - PlayerComposition.scene.init(Tiles.Tiles_minPlane); + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 498 + throw new RuntimeException("" + (var11 - 1)); } else { - PlayerComposition.scene.init(0); - } - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - HealthBarUpdate.updateItemPile(var5, var6); - } - } - - class356.playPcmPlayers(); - - for (PendingSpawn var76 = (PendingSpawn)Client.pendingSpawns.last(); var76 != null; var76 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var76.hitpoints == -1) { - var76.delay = 0; - Script.method1969(var76); + Widget var12 = new Widget(); // L: 499 + var12.type = var4; // L: 500 + var12.parentId = var12.id = var6.id; // L: 501 + var12.childIndex = var11; // L: 502 + var12.isIf3 = true; // L: 503 + var6.children[var11] = var12; // L: 504 + if (var2) { // L: 505 + class120.scriptDotWidget = var12; } else { - var76.remove(); + Frames.scriptActiveWidget = var12; // L: 506 } + + class184.invalidateWidget(var6); // L: 507 + return 1; // L: 508 } - - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var77; - if (class21.client.hasFrame()) { - var77 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2723, Client.packetWriter.isaacCipher); - var77.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var77); - } - - if (!Client.isInInstance) { - var5 = (HealthBarDefinition.field1671 - 6) / 8; - var6 = (HealthBarDefinition.field1671 + 6) / 8; - var7 = (WorldMapArea.field2053 - 6) / 8; - var8 = (WorldMapArea.field2053 + 6) / 8; - - for (var9 = var5 - 1; var9 <= var6 + 1; ++var9) { - for (var10 = var7 - 1; var10 <= var8 + 1; ++var10) { - if (var9 < var5 || var9 > var6 || var10 < var7 || var10 > var8) { - ApproximateRouteStrategy.archive5.loadRegionFromName("m" + var9 + "_" + var10); - ApproximateRouteStrategy.archive5.loadRegionFromName("l" + var9 + "_" + var10); - } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 510 + var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 511 + Widget var10 = UserComparator9.getWidget(var3.id); // L: 512 + var10.children[var3.childIndex] = null; // L: 513 + class184.invalidateWidget(var10); // L: 514 + return 1; // L: 515 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 517 + var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 518 + var3.children = null; // L: 519 + class184.invalidateWidget(var3); // L: 520 + return 1; // L: 521 + } else if (var0 == 103) { // L: 523 + class14.Interpreter_intStackSize -= 3; // L: 524 + return 1; // L: 525 + } else if (var0 == 104) { // L: 527 + --class14.Interpreter_intStackSize; // L: 528 + return 1; // L: 529 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 531 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 544 + var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 545 + if (var3 != null) { // L: 546 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 547 + if (var2) { // L: 548 + class120.scriptDotWidget = var3; + } else { + Frames.scriptActiveWidget = var3; // L: 549 } + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 551 } + + return 1; // L: 552 + } else if (var0 == 202) { // L: 554 + Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] = 0; // L: 555 + return 1; // L: 556 + } else if (var0 == 203) { // L: 558 + Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize + 1] = 0; // L: 559 + return 1; // L: 560 + } else { + return 2; // L: 562 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 532 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 533 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 534 + Widget var5 = ItemContainer.getWidgetChild(var9, var4); // L: 535 + if (var5 != null && var4 != -1) { // L: 536 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 537 + if (var2) { // L: 538 + class120.scriptDotWidget = var5; + } else { + Frames.scriptActiveWidget = var5; // L: 539 + } + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 541 } - UserList.updateGameState(30); - class356.playPcmPlayers(); - SecureRandomCallable.method2036(); - var77 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2680, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var77); - LoginPacket.clock.mark(); - - for (var6 = 0; var6 < 32; ++var6) { - GameEngine.graphicsTickTimes[var6] = 0L; - } - - for (var6 = 0; var6 < 32; ++var6) { - GameEngine.clientTickTimes[var6] = 0L; - } - - GameEngine.gameCyclesToDo = 0; + return 1; // L: 542 } } } + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIII)V", + garbageValue = "1223728297" + ) + @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: 7473 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7474 7475 7480 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7476 + var9 = var10; // L: 7477 + break; + } + } + + if (var9 == null) { // L: 7482 + var9 = new PendingSpawn(); // L: 7483 + var9.plane = var0; // L: 7484 + var9.type = var3; // L: 7485 + var9.x = var1; // L: 7486 + var9.y = var2; // L: 7487 + class14.method180(var9); // L: 7488 + Client.pendingSpawns.addFirst(var9); // L: 7489 + } + + var9.id = var4; // L: 7491 + var9.field1082 = var5; // L: 7492 + var9.orientation = var6; // L: 7493 + var9.delay = var7; // L: 7494 + var9.hitpoints = var8; // L: 7495 + } // L: 7496 + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "([Ljf;IIIZB)V", + garbageValue = "124" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10244 + Widget var6 = var0[var5]; // L: 10245 + if (var6 != null && var6.parentId == var1) { // L: 10246 10247 + WorldMapScaleHandler.alignWidgetSize(var6, var2, var3, var4); // L: 10248 + LoginPacket.alignWidgetPosition(var6, var2, var3); // L: 10249 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10250 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10251 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10252 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10253 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10254 + MouseRecorder.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 10256 + @ObfuscatedName("jw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-220787387" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "28" ) - static final void method3445() { - PacketBufferNode var0 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - class16.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - + static final String method3534(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10344 10345 } - @ObfuscatedName("js") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(Lct;ZS)V", - garbageValue = "-12050" + descriptor = "(IB)V", + garbageValue = "98" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1 && var2 != -1 && class157.Widget_loadedInterfaces[var2]) { - Widget.Widget_archive.clearFilesGroup(var2); - if (Widget.Widget_interfaceComponents[var2] != null) { - boolean var4 = true; - - for (int var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { - if (Widget.Widget_interfaceComponents[var2][var5] != null) { - if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { - Widget.Widget_interfaceComponents[var2][var5] = null; - } else { - var4 = false; - } - } + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + ItemComposition.method3406(); // L: 11415 + FriendLoginUpdate.method6058(); // L: 11416 + int var1 = ArchiveLoader.VarpDefinition_get(var0).type; // L: 11417 + if (var1 != 0) { // L: 11418 + int var2 = Varps.Varps_main[var0]; // L: 11419 + if (var1 == 1) { // L: 11420 + if (var2 == 1) { // L: 11421 + class354.method6396(0.9D); } - if (var4) { - Widget.Widget_interfaceComponents[var2] = null; + if (var2 == 2) { // L: 11422 + class354.method6396(0.8D); } - class157.Widget_loadedInterfaces[var2] = false; + if (var2 == 3) { // L: 11423 + class354.method6396(0.7D); + } + + if (var2 == 4) { // L: 11424 + class354.method6396(0.6D); + } } - } - for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { - if ((long)var2 == (var6.key >> 48 & 65535L)) { - var6.remove(); + if (var1 == 3) { // L: 11426 + if (var2 == 0) { // L: 11427 + class14.method178(255); + } + + if (var2 == 1) { // L: 11428 + class14.method178(192); + } + + if (var2 == 2) { // L: 11429 + class14.method178(128); + } + + if (var2 == 3) { // L: 11430 + class14.method178(64); + } + + if (var2 == 4) { // L: 11431 + class14.method178(0); + } } - } - Widget var7 = HealthBarUpdate.getWidget(var3); - if (var7 != null) { - class16.invalidateWidget(var7); - } + if (var1 == 4) { // L: 11433 + if (var2 == 0) { // L: 11434 + WorldMapSection1.updateSoundEffectVolume(127); + } - class132.method2699(); - if (Client.rootInterface != -1) { - ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); - } + if (var2 == 1) { // L: 11435 + WorldMapSection1.updateSoundEffectVolume(96); + } - } + if (var2 == 2) { // L: 11436 + WorldMapSection1.updateSoundEffectVolume(64); + } + + if (var2 == 3) { // L: 11437 + WorldMapSection1.updateSoundEffectVolume(32); + } + + if (var2 == 4) { // L: 11438 + WorldMapSection1.updateSoundEffectVolume(0); + } + } + + if (var1 == 5) { // L: 11440 + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { // L: 11441 + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field656 = var2; // L: 11442 + } + + if (var1 == 10) { // L: 11443 + if (var2 == 0) { // L: 11444 + ClanChannel.method2825(127); + } + + if (var2 == 1) { // L: 11445 + ClanChannel.method2825(96); + } + + if (var2 == 2) { // L: 11446 + ClanChannel.method2825(64); + } + + if (var2 == 3) { // L: 11447 + ClanChannel.method2825(32); + } + + if (var2 == 4) { // L: 11448 + ClanChannel.method2825(0); + } + } + + if (var1 == 17) { // L: 11450 + Client.followerIndex = var2 & 65535; // L: 11451 + } + + if (var1 == 18) { // L: 11453 + Client.playerAttackOption = (AttackOption)UserComparator4.findEnumerated(Login.method1950(), var2); // L: 11454 + if (Client.playerAttackOption == null) { // L: 11455 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { // L: 11457 + if (var2 == -1) { // L: 11458 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11459 + } + } + + if (var1 == 22) { // L: 11461 + Client.npcAttackOption = (AttackOption)UserComparator4.findEnumerated(Login.method1950(), var2); // L: 11462 + if (Client.npcAttackOption == null) { // L: 11463 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 11465 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 4ad42b0f16..667257781b 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -1,474 +1,572 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gv") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("loaded") boolean loaded; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgj;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Low;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("icons") HashMap icons; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[[Lfx;" + descriptor = "[[Lfk;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loe;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("fonts") final HashMap fonts; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2007666273 + intValue = 1580083231 ) @Export("tileX") int tileX; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -11493957 + intValue = 1005750841 ) @Export("tileY") int tileY; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2131514409 + intValue = 1027044671 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -387965393 + intValue = 730187433 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -129692209 + intValue = 1922156865 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Loz;Ljava/util/HashMap;Lkl;Lkl;)V" + descriptor = "([Loe;Ljava/util/HashMap;Lko;Lko;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { - 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; - } + 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 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkl;Ljava/lang/String;ZI)V", - garbageValue = "1633509701" + descriptor = "(Lko;Ljava/lang/String;ZI)V", + garbageValue = "-535432557" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { - if (!this.loadStarted) { - this.loaded = false; - this.loadStarted = true; - System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field2220.name); - int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2220.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2215.name, var2)); - System.nanoTime(); - System.nanoTime(); - this.mapAreaData = new WorldMapAreaData(); + if (!this.loadStarted) { // L: 41 + this.loaded = false; // L: 44 + this.loadStarted = true; // L: 45 + System.nanoTime(); // L: 46 + int var4 = var1.getGroupId(WorldMapCacheName.field2210.name); // L: 47 + int var5 = var1.getFileId(var4, var2); // L: 48 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2210.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2211.name, var2)); // L: 50 + System.nanoTime(); // L: 51 + System.nanoTime(); // L: 52 + this.mapAreaData = new WorldMapAreaData(); // L: 53 try { - this.mapAreaData.init(var6, var7, var5, var3); - } catch (IllegalStateException var19) { - return; + this.mapAreaData.init(var6, var7, var5, var3); // L: 55 + } catch (IllegalStateException var23) { // L: 57 + return; // L: 58 } - 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(); - class17.method226(); - this.regions = new WorldMapRegion[var16][var9]; - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); + 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 var17 = 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 + InvDefinition.method2983(); // L: 71 + this.regions = new WorldMapRegion[var17][var9]; // L: 72 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + int var13; + int var14; while (var10.hasNext()) { - 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); + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 + int var12 = var11.regionX; // L: 76 + var13 = var11.regionY; // L: 77 + 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 } - 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); + for (int var18 = 0; var18 < var17; ++var18) { // L: 84 + for (int var19 = 0; var19 < var9; ++var19) { // L: 85 + if (this.regions[var18][var19] == null) { // L: 86 + this.regions[var18][var19] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var18, this.mapAreaData.getRegionLowY() + var19, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87 + this.regions[var18][var19].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88 } } } - System.nanoTime(); - System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field2216.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2216.name, var2); - this.compositeTextureSprite = class135.convertJpgToSprite(var20); + System.nanoTime(); // L: 92 + System.nanoTime(); // L: 93 + if (var1.isValidFileName(WorldMapCacheName.field2215.name, var2)) { // L: 94 + byte[] var26 = var1.takeFileByNames(WorldMapCacheName.field2215.name, var2); // L: 95 + BufferedImage var20 = null; // L: 98 + + SpritePixels var27; + label48: { + try { + var20 = ImageIO.read(new ByteArrayInputStream(var26)); // L: 100 + var13 = var20.getWidth(); // L: 101 + var14 = var20.getHeight(); // L: 102 + int[] var21 = new int[var14 * var13]; // L: 103 + PixelGrabber var16 = new PixelGrabber(var20, 0, 0, var13, var14, var21, 0, var13); // L: 104 + var16.grabPixels(); // L: 105 + var27 = new SpritePixels(var21, var13, var14); // L: 106 + break label48; + } catch (IOException var24) { // L: 109 + } catch (InterruptedException var25) { // L: 110 + } + + var27 = new SpritePixels(0, 0); // L: 111 + } + + this.compositeTextureSprite = var27; // L: 113 } - System.nanoTime(); - var1.clearGroups(); - var1.clearFiles(); - this.loaded = true; + System.nanoTime(); // L: 115 + var1.clearGroups(); // L: 116 + var1.clearFiles(); // L: 117 + this.loaded = true; // L: 118 } - } + } // L: 42 119 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1401830870" + descriptor = "(B)V", + garbageValue = "77" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; - } + this.icons = null; // L: 122 + } // L: 123 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-668867918" + garbageValue = "634870474" ) @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; - 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[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 126 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 127 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 128 + int[] var12 = new int[4]; // L: 129 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 130 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 131 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 132 + int var15 = (int)Math.ceil((double)var14); // L: 133 + this.pixelsPerTile = var15; // L: 134 + if (!this.scaleHandlers.containsKey(var15)) { // L: 135 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 136 + var16.init(); // L: 137 + this.scaleHandlers.put(var15, var16); // L: 138 } - int var23 = var13.width + var13.x - 1; - int var17 = var13.height + var13.y - 1; + int var23 = var13.x + var13.width - 1; // L: 140 + int var17 = var13.height + var13.y - 1; // L: 141 int var18; int var19; - 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); + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 142 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 143 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 144 } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); - Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(var14 * 64.0F); - var19 = this.tileX + var1; - int var20 = var2 + this.tileY; + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 147 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 148 + var18 = (int)(64.0F * var14); // L: 149 + var19 = this.tileX + var1; // L: 150 + int var20 = var2 + this.tileY; // L: 151 - 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].method3569(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 152 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 153 + this.regions[var21][var22].method3685(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 154 } } - } + } // L: 157 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-840000073" + descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", + garbageValue = "0" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var16 = (int)(64.0F * var15); - int var17 = this.tileX + var1; - int var18 = var2 + this.tileY; + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 160 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 161 + int var16 = (int)(64.0F * var15); // L: 162 + int var17 = this.tileX + var1; // L: 163 + int var18 = var2 + this.tileY; // L: 164 int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { - if (var13) { - this.regions[var19][var20].initWorldMapIcon1s(); + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 165 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 166 + if (var13) { // L: 167 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 168 } - this.regions[var19][var20].method3579(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method3681(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 170 } } - if (var10 != null && var11 > 0) { - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { - this.regions[var19][var20].flashElements(var10, var11, var12); + if (var10 != null && var11 > 0) { // L: 173 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 174 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 175 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 176 } } } - } + } // L: 180 - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "111" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "1858879901" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - if (this.compositeTextureSprite != null) { - this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); - if (var6 > 0 && var6 % var7 < var7 / 2) { - if (this.icons == null) { - this.buildIcons0(); + if (this.compositeTextureSprite != null) { // L: 183 + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 186 + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 187 + if (this.icons == null) { // L: 190 + this.buildIcons0(); // L: 191 } - Iterator var8 = var5.iterator(); + Iterator var8 = var5.iterator(); // L: 193 while (true) { List var10; do { if (!var8.hasNext()) { - return; + return; // L: 210 } - int var9 = (Integer)var8.next(); - var10 = (List)this.icons.get(var9); - } while(var10 == null); + int var9 = (Integer)var8.next(); // L: 194 + var10 = (List)this.icons.get(var9); // L: 196 + } while(var10 == null); // L: 197 - Iterator var11 = var10.iterator(); + Iterator var11 = var10.iterator(); // L: 200 while (var11.hasNext()) { - 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); + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 201 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 203 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 204 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 205 } } } } - } + } // L: 184 188 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "-2118739630" + garbageValue = "2076457944" ) - public List method3698(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - LinkedList var11 = new LinkedList(); - if (!this.loaded) { - return var11; + public List method3807(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: 213 + if (!this.loaded) { // L: 214 + return var11; // L: 215 } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(var13 * 64.0F); - int var15 = this.tileX + var1; - int var16 = var2 + this.tileY; + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 217 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 218 + int var14 = (int)(64.0F * var13); // L: 219 + int var15 = this.tileX + var1; // L: 220 + int var16 = var2 + this.tileY; // L: 221 - for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method3599(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); + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 222 + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 223 + List var19 = this.regions[var17][var18].method3687(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: 224 + if (!var19.isEmpty()) { // L: 225 + var11.addAll(var19); // L: 226 } } } - return var11; + return var11; // L: 230 } } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIIB)Lgo;", - garbageValue = "35" - ) - @Export("createWorldMapRectangle") - WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { - 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) { - var5.width = this.regions.length - var5.x; - } - - if (var5.y < 0) { - var5.height += var5.y; - var5.y = 0; - } - - 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); - var5.height = Math.min(var5.height, this.regions[0].length); - return var5; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1950948657" - ) - @Export("isLoaded") - public boolean isLoaded() { - return this.loaded; - } - @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "34907623" + descriptor = "(IIIIB)Lgb;", + garbageValue = "47" + ) + @Export("createWorldMapRectangle") + WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 234 + int var6 = this.tileX + var1; // L: 235 + int var7 = var2 + this.tileY; // L: 236 + int var8 = var3 + this.tileX; // L: 237 + int var9 = var4 + this.tileY; // L: 238 + int var10 = var6 / 64; // L: 239 + int var11 = var7 / 64; // L: 240 + int var12 = var8 / 64; // L: 241 + int var13 = var9 / 64; // L: 242 + var5.width = var12 - var10 + 1; // L: 243 + var5.height = var13 - var11 + 1; // L: 244 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 245 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 246 + if (var5.x < 0) { // L: 247 + var5.width += var5.x; // L: 248 + var5.x = 0; // L: 249 + } + + if (var5.x > this.regions.length - var5.width) { // L: 251 + var5.width = this.regions.length - var5.x; // L: 252 + } + + if (var5.y < 0) { // L: 254 + var5.height += var5.y; // L: 255 + var5.y = 0; // L: 256 + } + + if (var5.y > this.regions[0].length - var5.height) { // L: 258 + var5.height = this.regions[0].length - var5.y; // L: 259 + } + + var5.width = Math.min(var5.width, this.regions.length); // L: 261 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 262 + return var5; // L: 263 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "16711935" + ) + @Export("isLoaded") + public boolean isLoaded() { + return this.loaded; // L: 267 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(S)Ljava/util/HashMap;", + garbageValue = "11419" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); - return this.icons; + this.buildIcons0(); // L: 271 + return this.icons; // L: 272 } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "50226969" + garbageValue = "60263929" ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { - this.icons = new HashMap(); + if (this.icons == null) { // L: 276 + this.icons = new HashMap(); // L: 277 } - this.icons.clear(); + this.icons.clear(); // L: 279 - 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(); + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 280 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 281 + List var3 = this.regions[var1][var2].icons(); // L: 282 + Iterator var4 = var3.iterator(); // L: 283 while (var4.hasNext()) { - 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); + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 284 + if (var5.hasValidElement()) { // L: 286 + int var6 = var5.getElement(); // L: 287 + if (!this.icons.containsKey(var6)) { // L: 288 + LinkedList var7 = new LinkedList(); // L: 289 + var7.add(var5); // L: 290 + this.icons.put(var6, var7); // L: 291 } else { - List var8 = (List)this.icons.get(var6); - var8.add(var5); + List var8 = (List)this.icons.get(var6); // L: 294 + var8.add(var5); // L: 295 } } } } } - } + } // L: 301 - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(III)F", - garbageValue = "-1870521455" + descriptor = "(IIB)F", + garbageValue = "-7" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; - if (var3 > 8.0F) { + float var3 = (float)var1 / (float)var2; // L: 304 + if (var3 > 8.0F) { // L: 305 return 8.0F; - } else if (var3 < 1.0F) { + } else if (var3 < 1.0F) { // L: 306 return 1.0F; } else { - int var4 = Math.round(var3); - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; + int var4 = Math.round(var3); // L: 307 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 308 309 } } - @ObfuscatedName("j") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(ILkl;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-826491014" + descriptor = "(Lct;I)V", + garbageValue = "2038669517" ) - public static void method3727(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - VertexNormal.method4560(var0, var1, var6, var7, var4, var5); - } + static final void method3814(Actor var0) { + if (var0.field1138 != 0) { // L: 4400 + if (var0.targetIndex != -1) { // L: 4401 + Object var1 = null; // L: 4402 + if (var0.targetIndex < 32768) { // L: 4403 + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 4404 + var1 = Client.players[var0.targetIndex - 32768]; + } + + if (var1 != null) { // L: 4405 + int var2 = var0.x - ((Actor)var1).x; // L: 4406 + int var3 = var0.y - ((Actor)var1).y; // L: 4407 + if (var2 != 0 || var3 != 0) { // L: 4408 + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 4410 + var0.targetIndex = -1; // L: 4411 + var0.false0 = false; // L: 4412 + } + } + + if (var0.field1112 != -1 && (var0.pathLength == 0 || var0.field1085 > 0)) { // L: 4415 + var0.orientation = var0.field1112; // L: 4416 + var0.field1112 = -1; // L: 4417 + } + + int var4 = var0.orientation - var0.rotation & 2047; // L: 4419 + if (var4 == 0 && var0.false0) { // L: 4420 + var0.targetIndex = -1; // L: 4421 + var0.false0 = false; // L: 4422 + } + + if (var4 != 0) { // L: 4424 + ++var0.field1137; // L: 4425 + boolean var6; + if (var4 > 1024) { // L: 4426 + var0.rotation -= var0.field1127 ? var4 : var0.field1138 * 369982221 * 1275186117; // L: 4427 + var6 = true; // L: 4428 + if (var4 < var0.field1138 || var4 > 2048 - var0.field1138) { // L: 4429 + var0.rotation = var0.orientation; // L: 4430 + var6 = false; // L: 4431 + } + + if (!var0.field1127 && var0.movementSequence == var0.idleSequence && (var0.field1137 > 25 || var6)) { // L: 4433 + if (var0.turnLeftSequence != -1) { // L: 4434 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4435 + } + } + } else { + var0.rotation += var0.field1127 ? var4 : 369982221 * var0.field1138 * 1275186117; // L: 4439 + var6 = true; // L: 4440 + if (var4 < var0.field1138 || var4 > 2048 - var0.field1138) { // L: 4441 + var0.rotation = var0.orientation; // L: 4442 + var6 = false; // L: 4443 + } + + if (!var0.field1127 && var0.idleSequence == var0.movementSequence && (var0.field1137 > 25 || var6)) { // L: 4445 + if (var0.turnRightSequence != -1) { // L: 4446 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4447 + } + } + } + + var0.rotation &= 2047; // L: 4451 + var0.field1127 = false; // L: 4452 + } else { + var0.field1137 = 0; // L: 4454 + } + + } + } // L: 4455 } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index cc4405441a..61d6dfbce2 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,43 +4,172 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gb") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1169726605 + intValue = 1778592037 ) @Export("width") int width; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1795160043 + intValue = 1730738719 ) @Export("height") int height; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 65148741 + intValue = 1307484671 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1075815641 + intValue = 2146368743 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgv;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lgd;)V" + descriptor = "(Lgv;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 320 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IILfc;Lfq;I)Z", + garbageValue = "-1234525376" + ) + public static final boolean method3959(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; + int var8 = var0 - var6; + int var9 = var1 - var7; + class174.directions[var6][var7] = 99; + class174.distances[var6][var7] = 0; // L: 26 + byte var10 = 0; + int var11 = 0; + class174.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class174.bufferY[var10001] = var1; + int[][] var12 = var3.flags; // L: 31 + + while (var11 != var18) { // L: 32 + var4 = class174.bufferX[var11]; // L: 33 + var5 = class174.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 + RouteStrategy.field1979 = var4; // L: 41 + class67.field845 = var5; // L: 42 + return true; // L: 43 + } + + int var15 = class174.distances[var16][var17] + 1; // L: 45 + if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49 + class174.bufferX[var18] = var4 - 1; // L: 50 + class174.bufferY[var18] = var5; // L: 51 + var18 = var18 + 1 & 4095; // L: 52 + class174.directions[var16 - 1][var17] = 2; // L: 53 + class174.distances[var16 - 1][var17] = var15; // L: 54 + } + + if (var16 < 126 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 57 58 59 + class174.bufferX[var18] = var4 + 1; // L: 60 + class174.bufferY[var18] = var5; // L: 61 + var18 = var18 + 1 & 4095; // L: 62 + class174.directions[var16 + 1][var17] = 8; // L: 63 + class174.distances[var16 + 1][var17] = var15; // L: 64 + } + + if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69 + class174.bufferX[var18] = var4; // L: 70 + class174.bufferY[var18] = var5 - 1; // L: 71 + var18 = var18 + 1 & 4095; // L: 72 + class174.directions[var16][var17 - 1] = 1; // L: 73 + class174.distances[var16][var17 - 1] = var15; // L: 74 + } + + if (var17 < 126 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79 + class174.bufferX[var18] = var4; // L: 80 + class174.bufferY[var18] = var5 + 1; // L: 81 + var18 = var18 + 1 & 4095; // L: 82 + class174.directions[var16][var17 + 1] = 4; // L: 83 + class174.distances[var16][var17 + 1] = var15; // L: 84 + } + + if (var16 > 0 && var17 > 0 && class174.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 + class174.bufferX[var18] = var4 - 1; // L: 91 + class174.bufferY[var18] = var5 - 1; // L: 92 + var18 = var18 + 1 & 4095; // L: 93 + class174.directions[var16 - 1][var17 - 1] = 3; // L: 94 + class174.distances[var16 - 1][var17 - 1] = var15; // L: 95 + } + + if (var16 < 126 && var17 > 0 && class174.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 + class174.bufferX[var18] = var4 + 1; // L: 102 + class174.bufferY[var18] = var5 - 1; // L: 103 + var18 = var18 + 1 & 4095; // L: 104 + class174.directions[var16 + 1][var17 - 1] = 9; // L: 105 + class174.distances[var16 + 1][var17 - 1] = var15; // L: 106 + } + + if (var16 > 0 && var17 < 126 && class174.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 + class174.bufferX[var18] = var4 - 1; // L: 113 + class174.bufferY[var18] = var5 + 1; // L: 114 + var18 = var18 + 1 & 4095; // L: 115 + class174.directions[var16 - 1][var17 + 1] = 6; // L: 116 + class174.distances[var16 - 1][var17 + 1] = var15; // L: 117 + } + + if (var16 < 126 && var17 < 126 && class174.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 + class174.bufferX[var18] = var4 + 1; // L: 124 + class174.bufferY[var18] = var5 + 1; // L: 125 + var18 = var18 + 1 & 4095; // L: 126 + class174.directions[var16 + 1][var17 + 1] = 12; // L: 127 + class174.distances[var16 + 1][var17 + 1] = var15; // L: 128 + } + } + + RouteStrategy.field1979 = var4; // L: 131 + class67.field845 = var5; // L: 132 + return false; // L: 133 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIIIIB)I", + garbageValue = "62" + ) + public static int method3960(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 22 + int var6 = var3; // L: 23 + var3 = var4; // L: 24 + var4 = var6; // L: 25 + } + + var2 &= 3; // L: 27 + if (var2 == 0) { // L: 28 + return var1; + } else if (var2 == 1) { // L: 29 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 30 + } } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 6f2dd0654f..85a03b15ef 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,167 +10,175 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fk") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhd;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("k") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lea;" + ) + static ClanChannel field2069; + @ObfuscatedName("iv") @ObfuscatedGetter( - intValue = 784175593 + intValue = -1587771547 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1512933093 ) @Export("regionX") int regionX; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1993185167 + intValue = -1311115551 ) @Export("regionY") int regionY; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfv;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1422223479 + intValue = -367405989 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1506951061 + intValue = -572472021 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("icon0List") List icon0List; - @ObfuscatedName("g") + @ObfuscatedName("k") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("v") + @ObfuscatedName("t") @Export("fonts") final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - 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; - } + this.regionX = var1; // L: 58 + this.regionY = var2; // L: 59 + this.worldMapData1List = new LinkedList(); // L: 60 + this.icon0List = new LinkedList(); // L: 61 + this.iconMap = new HashMap(); // L: 62 + this.backgroundColor = var3 | -16777216; // L: 63 + this.fonts = var4; // L: 64 + } // L: 65 - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1231459705" + garbageValue = "-1133697443" ) - void method3569(int var1, int var2, int var3) { - int var5 = this.regionX; - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - SpritePixels var4 = (SpritePixels)WorldMapRegion_cachedSprites.get(Clock.method2870(var5, var6, var7)); - if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { - var4.drawAt(var1, var2); + void method3685(int var1, int var2, int var3) { + SpritePixels var4 = FileSystem.method2909(this.regionX, this.regionY, this.pixelsPerTile); // L: 68 + if (var4 != null) { // L: 69 + if (var3 == this.pixelsPerTile * 64) { // L: 70 + var4.drawAt(var1, var2); // L: 71 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 74 } } - } + } // L: 76 - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lfj;Ljava/util/List;I)V", - garbageValue = "1441709008" + descriptor = "(Lfv;Ljava/util/List;S)V", + garbageValue = "8593" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); - this.worldMapData_0 = var1; - this.addAllToIconList(var2); - } + this.iconMap.clear(); // L: 79 + this.worldMapData_0 = var1; // L: 80 + this.addAllToIconList(var2); // L: 81 + } // L: 82 - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "1846535587" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", + garbageValue = "99" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); - Iterator var3 = var1.iterator(); + this.iconMap.clear(); // L: 85 + Iterator var3 = var1.iterator(); // L: 86 - while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { - this.worldMapData1List.add(var4); + while (var3.hasNext()) { // L: 93 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 87 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 89 + this.worldMapData1List.add(var4); // L: 90 } } - this.addAllToIconList(var2); - } + this.addAllToIconList(var2); // L: 94 + } // L: 95 - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIILge;I)V", - garbageValue = "-66518747" + descriptor = "(IIIILgl;I)V", + garbageValue = "1671953569" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { - label75: - 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 var6 = var1; var6 < var3 + var1; ++var6) { // L: 98 + label76: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 99 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 100 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 101 + if (var9 != null && var9.length != 0) { // L: 102 + WorldMapDecoration[] var10 = var9; // L: 106 - for (int var11 = 0; var11 < var10.length; ++var11) { + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 107 ObjectComposition var13; boolean var14; - label66: { - WorldMapDecoration var12 = var10[var11]; - var13 = class245.getObjectDefinition(var12.objectDefinitionId); - if (var13.transforms != null) { - int[] var15 = var13.transforms; + label67: { + WorldMapDecoration var12 = var10[var11]; // L: 108 + var13 = KitDefinition.getObjectDefinition(var12.objectDefinitionId); // L: 110 + if (var13.transforms != null) { // L: 113 + int[] var15 = var13.transforms; // L: 115 - for (int var16 = 0; var16 < var15.length; ++var16) { - int var17 = var15[var16]; - ObjectComposition var18 = class245.getObjectDefinition(var17); - if (var18.mapIconId != -1) { - var14 = true; - break label66; + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 116 + int var17 = var15[var16]; // L: 117 + ObjectComposition var18 = KitDefinition.getObjectDefinition(var17); // L: 119 + if (var18.mapIconId != -1) { // L: 120 + var14 = true; // L: 121 + break label67; } } - } else if (var13.mapIconId != -1) { - var14 = true; - break label66; + } else if (var13.mapIconId != -1) { // L: 128 + var14 = true; // L: 129 + break label67; // L: 130 } - var14 = false; + var14 = false; // L: 132 } - if (var14) { - this.getIcon(var13, var8, var6, var7, var5); - continue label75; + if (var14) { // L: 134 + this.getIcon(var13, var8, var6, var7, var5); // L: 137 + continue label76; // L: 138 } } } @@ -178,434 +186,561 @@ public class WorldMapRegion { } } - } + } // L: 145 - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lfo;IIILge;I)V", - garbageValue = "-1742341954" + descriptor = "(Lfe;IIILgl;I)V", + garbageValue = "-844362514" ) @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); - 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); + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 148 + Coord var7 = null; // L: 149 + if (this.worldMapData_0 != null) { // L: 150 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 151 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 154 + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 155 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); + if (var1.transforms != null) { // L: 158 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 159 } else { - var9 = class13.WorldMapElement_get(var1.mapIconId); - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); + var9 = ItemComposition.WorldMapElement_get(var1.mapIconId); // L: 162 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 163 } - var9 = class13.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1633) { - this.iconMap.put(new Coord(0, var3, var4), var10); + var9 = ItemComposition.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 165 + if (var9.field1641) { // L: 166 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 167 } - } + } // L: 169 - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-54" + descriptor = "(I)V", + garbageValue = "1929800499" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); + Iterator var1 = this.iconMap.values().iterator(); // L: 172 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); - if (var2 instanceof WorldMapIcon_1) { - ((WorldMapIcon_1)var2).init(); + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 173 + if (var2 instanceof WorldMapIcon_1) { // L: 175 + ((WorldMapIcon_1)var2).init(); // L: 176 } } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "-1935534195" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); - - while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (class13.WorldMapElement_get(var3.element).field1633 && 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.method3597(var3.element)); - this.icon0List.add(var4); - } - } - - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-18665" - ) - void method3576() { - if (this.worldMapData_0 != null) { - this.worldMapData_0.reset(); - } else { - Iterator var1 = this.worldMapData1List.iterator(); - - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); - var2.reset(); - } - } - - } + } // L: 180 @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lkl;B)Z", - garbageValue = "32" + descriptor = "(Ljava/util/List;I)V", + garbageValue = "-402156972" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 183 + + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 184 + if (ItemComposition.WorldMapElement_get(var3.element).field1641 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 186 189 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3756(var3.element)); // L: 190 + this.icon0List.add(var4); // L: 191 + } + } + + } // L: 195 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1891636337" + ) + void method3663() { + if (this.worldMapData_0 != null) { // L: 198 + this.worldMapData_0.reset(); // L: 199 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 202 + + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 203 + var2.reset(); // L: 205 + } + } + + } // L: 209 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lko;I)Z", + garbageValue = "734008370" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - 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; + this.iconMap.clear(); // L: 212 + if (this.worldMapData_0 != null) { // L: 213 + this.worldMapData_0.loadGeography(var1); // L: 214 + if (this.worldMapData_0.isFullyLoaded()) { // L: 215 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 216 + return true; // L: 217 } else { - return false; + return false; // L: 219 } } else { - boolean var2 = true; + boolean var2 = true; // L: 222 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { - var4 = (WorldMapData_1)var3.next(); - var4.loadGeography(var1); + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 223 227 + var4 = (WorldMapData_1)var3.next(); // L: 224 + var4.loadGeography(var1); // L: 226 } - if (var2) { - var3 = this.worldMapData1List.iterator(); + if (var2) { // L: 230 + var3 = this.worldMapData1List.iterator(); // L: 231 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); + var4 = (WorldMapData_1)var3.next(); // L: 232 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 234 } } - return var2; + return var2; // L: 238 } } - @ObfuscatedName("w") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILgg;[Loz;Lkl;Lkl;I)V", - garbageValue = "-538848998" + descriptor = "(ILge;[Loe;Lko;Lko;I)V", + garbageValue = "749682565" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - int var7 = this.regionX; - int var8 = this.regionY; - SpritePixels var6 = (SpritePixels)WorldMapRegion_cachedSprites.get(Clock.method2870(var7, var8, var1)); - if (var6 == null) { - boolean var9 = true; - var9 &= this.loadGeography(var4); - int var11; - if (this.worldMapData_0 != null) { - var11 = this.worldMapData_0.groupId; + this.pixelsPerTile = var1; // L: 243 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 244 + if (FileSystem.method2909(this.regionX, this.regionY, var1) == null) { // L: 247 + boolean var6 = true; // L: 250 + var6 &= this.loadGeography(var4); // L: 251 + int var8; + if (this.worldMapData_0 != null) { // L: 254 + var8 = this.worldMapData_0.groupId; // L: 255 } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 258 } - var9 &= var5.tryLoadGroup(var11); - if (var9) { - byte[] var10 = var5.takeFileFlat(var11); - WorldMapSprite var12 = method3629(var10); - SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var13.setRaster(); - if (this.worldMapData_0 != null) { - this.method3581(var2, var3, var12); + var6 &= var5.tryLoadGroup(var8); // L: 260 + if (var6) { // L: 261 + byte[] var7 = var5.takeFileFlat(var8); // L: 262 + WorldMapSprite var9 = class115.method2554(var7); // L: 263 + SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 264 + var10.setRaster(); // L: 265 + if (this.worldMapData_0 != null) { // L: 266 + this.method3668(var2, var3, var9); // L: 267 } else { - this.method3582(var2, var3, var12); + this.method3752(var2, var3, var9); // L: 270 } - int var14 = this.regionX; - int var15 = this.regionY; - int var16 = this.pixelsPerTile; - WorldMapRegion_cachedSprites.put(var13, Clock.method2870(var14, var15, var16), var13.pixels.length * 4); - this.method3576(); + class174.method3512(var10, this.regionX, this.regionY, this.pixelsPerTile); // L: 272 + this.method3663(); // L: 273 } } } - } + } // L: 245 248 274 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "-121819239" + garbageValue = "-1052443043" ) - void method3579(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { - var4 = new HashSet(); + void method3681(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 277 + var4 = new HashSet(); // L: 278 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); - this.drawMapLinks(var1, var2, var4, var3); - } + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 280 + this.drawMapLinks(var1, var2, var4, var3); // L: 281 + } // L: 282 - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-2126026396" + garbageValue = "1956644892" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); + Iterator var4 = this.iconMap.values().iterator(); // L: 285 - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - int var6 = var5.getElement(); - if (var1.contains(var6)) { - WorldMapElement var7 = class13.WorldMapElement_get(var6); - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); + while (var4.hasNext()) { // L: 295 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 286 + if (var5.hasValidElement()) { // L: 288 + int var6 = var5.getElement(); // L: 289 + if (var1.contains(var6)) { // L: 290 + WorldMapElement var7 = ItemComposition.WorldMapElement_get(var6); // L: 291 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 292 } } } - this.method3691(var1, var2, var3); - } + this.method3719(var1, var2, var3); // L: 296 + } // L: 297 - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgg;[Loz;Lgw;I)V", - garbageValue = "1347230920" + descriptor = "(Lge;[Loe;Lgg;S)V", + garbageValue = "-21128" ) - void method3581(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method3668(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { - for (var5 = 0; var5 < 64; ++var5) { - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method3585(var4, var5, this.worldMapData_0, var1); + for (var4 = 0; var4 < 64; ++var4) { // L: 300 + for (var5 = 0; var5 < 64; ++var5) { // L: 301 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 302 + this.method3672(var4, var5, this.worldMapData_0, var1); // L: 303 } } - for (var4 = 0; var4 < 64; ++var4) { - for (var5 = 0; var5 < 64; ++var5) { - this.method3583(var4, var5, this.worldMapData_0, var1, var2); + for (var4 = 0; var4 < 64; ++var4) { // L: 306 + for (var5 = 0; var5 < 64; ++var5) { // L: 307 + this.method3678(var4, var5, this.worldMapData_0, var1, var2); // L: 308 } } - } + } // L: 311 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lgg;[Loz;Lgw;B)V", - garbageValue = "-20" + descriptor = "(Lge;[Loe;Lgg;I)V", + garbageValue = "-1733942667" ) - void method3582(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); + void method3752(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 314 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 315 - 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.method3585(var6, var7, var5, var1); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 317 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 318 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 319 + this.method3672(var6, var7, var5, var1); // L: 320 } } } - var4 = this.worldMapData1List.iterator(); + var4 = this.worldMapData1List.iterator(); // L: 325 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 326 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method3583(var6, var7, var5, var1, var2); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 328 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 329 + this.method3678(var6, var7, var5, var1, var2); // L: 330 } } } - } + } // L: 335 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILge;Lgg;[Loz;B)V", - garbageValue = "-22" + descriptor = "(IILgl;Lge;[Loe;I)V", + garbageValue = "239188021" ) - void method3583(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method3620(var1, var2, var3); - this.method3594(var1, var2, var3, var5); - } + void method3678(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method3675(var1, var2, var3); // L: 338 + this.method3674(var1, var2, var3, var5); // L: 339 + } // L: 340 - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IILge;Lgg;Lgw;I)V", - garbageValue = "1425155164" + descriptor = "(IILgl;Lge;Lgg;B)V", + garbageValue = "127" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - 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 var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 343 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 344 + if (var6 == -1 && var7 == -1) { // L: 345 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 346 } - int var8 = 16711935; - if (var7 != -1) { - var8 = ItemContainer.method2059(var7, this.backgroundColor); - } - - if (var7 > -1 && var3.field2155[0][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); - } else { - int var9 = this.method3586(var1, var2, var3, var5); - if (var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); + int var8 = 16711935; // L: 348 + int var9; + if (var7 != -1) { // L: 349 + int var10 = this.backgroundColor; // L: 351 + FloorOverlayDefinition var11 = InvDefinition.method2987(var7); // L: 353 + if (var11 == null) { // L: 354 + var9 = var10; // L: 355 + } else if (var11.secondaryRgb >= 0) { // L: 358 + var9 = var11.secondaryRgb | -16777216; // L: 359 } else { - var4.method4009(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2155[0][var1][var2], var3.field2149[0][var1][var2]); + int var12; + int var13; + byte var14; + int var16; + if (var11.texture >= 0) { // L: 361 + var13 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); // L: 363 + var14 = 96; // L: 364 + if (var13 == -2) { // L: 366 + var12 = 12345678; // L: 367 + } else if (var13 == -1) { // L: 370 + if (var14 < 0) { // L: 371 + var14 = 0; // L: 372 + } else if (var14 > 127) { // L: 374 + var14 = 127; // L: 375 + } + + var16 = 127 - var14; // L: 377 + var12 = var16; // L: 378 + } else { + var16 = var14 * (var13 & 127) / 128; // L: 381 + if (var16 < 2) { // L: 382 + var16 = 2; + } else if (var16 > 126) { // L: 383 + var16 = 126; + } + + var12 = var16 + (var13 & 65408); // L: 384 + } + + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 387 + } else if (var11.primaryRgb == 16711935) { // L: 389 + var9 = var10; // L: 390 + } else { + var12 = LoginScreenAnimation.method2218(var11.hue, var11.saturation, var11.lightness); // L: 393 + var14 = 96; // L: 395 + if (var12 == -2) { // L: 397 + var13 = 12345678; // L: 398 + } else if (var12 == -1) { // L: 401 + if (var14 < 0) { // L: 402 + var14 = 0; // L: 403 + } else if (var14 > 127) { // L: 405 + var14 = 127; // L: 406 + } + + var16 = 127 - var14; // L: 408 + var13 = var16; // L: 409 + } else { + var16 = var14 * (var12 & 127) / 128; // L: 412 + if (var16 < 2) { // L: 413 + var16 = 2; + } else if (var16 > 126) { // L: 414 + var16 = 126; + } + + var13 = var16 + (var12 & 65408); // L: 415 + } + + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 418 + } + } + + var8 = var9; // L: 421 + } + + if (var7 > -1 && var3.field2154[0][var1][var2] == 0) { // L: 423 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 424 + } else { + var9 = this.method3673(var1, var2, var3, var5); // L: 427 + if (var7 == -1) { // L: 428 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 429 + } else { + var4.method4086(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2154[0][var1][var2], var3.field2145[0][var1][var2]); // L: 432 } } - } + } // L: 425 430 433 - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILge;Lgg;B)V", - garbageValue = "-95" + descriptor = "(IILgl;Lge;B)V", + garbageValue = "33" ) - void method3585(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; - if (var6 > -1) { - int var7 = ItemContainer.method2059(var6, this.backgroundColor); - if (var3.field2155[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); + void method3672(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 436 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 437 + if (var6 > -1) { // L: 438 + int var8 = this.backgroundColor; // L: 440 + FloorOverlayDefinition var9 = InvDefinition.method2987(var6); // L: 442 + int var7; + if (var9 == null) { // L: 443 + var7 = var8; // L: 444 + } else if (var9.secondaryRgb >= 0) { // L: 447 + var7 = var9.secondaryRgb | -16777216; // L: 448 } else { - var4.method4009(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2155[var5][var1][var2], var3.field2149[var5][var1][var2]); + int var10; + int var11; + byte var12; + int var15; + if (var9.texture >= 0) { // L: 450 + var11 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); // L: 452 + var12 = 96; // L: 453 + if (var11 == -2) { // L: 455 + var10 = 12345678; // L: 456 + } else if (var11 == -1) { // L: 459 + if (var12 < 0) { // L: 460 + var12 = 0; // L: 461 + } else if (var12 > 127) { // L: 463 + var12 = 127; // L: 464 + } + + var15 = 127 - var12; // L: 466 + var10 = var15; // L: 467 + } else { + var15 = var12 * (var11 & 127) / 128; // L: 470 + if (var15 < 2) { // L: 471 + var15 = 2; + } else if (var15 > 126) { // L: 472 + var15 = 126; + } + + var10 = var15 + (var11 & 65408); // L: 473 + } + + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 476 + } else if (var9.primaryRgb == 16711935) { // L: 478 + var7 = var8; // L: 479 + } else { + var10 = LoginScreenAnimation.method2218(var9.hue, var9.saturation, var9.lightness); // L: 482 + var12 = 96; // L: 484 + if (var10 == -2) { // L: 486 + var11 = 12345678; // L: 487 + } else if (var10 == -1) { // L: 490 + if (var12 < 0) { // L: 491 + var12 = 0; // L: 492 + } else if (var12 > 127) { // L: 494 + var12 = 127; // L: 495 + } + + var15 = 127 - var12; // L: 497 + var11 = var15; // L: 498 + } else { + var15 = var12 * (var10 & 127) / 128; // L: 501 + if (var15 < 2) { // L: 502 + var15 = 2; + } else if (var15 > 126) { // L: 503 + var15 = 126; + } + + var11 = var15 + (var10 & 65408); // L: 504 + } + + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; // L: 507 + } + } + + if (var3.field2154[var5][var1][var2] == 0) { // L: 511 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 512 + } else { + var4.method4086(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2154[var5][var1][var2], var3.field2145[var5][var1][var2]); // L: 515 } } } + } // L: 519 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IILgl;Lgg;B)I", + garbageValue = "4" + ) + int method3673(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 522 523 525 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IILge;Lgw;I)I", - garbageValue = "828533450" + descriptor = "(IILgl;[Loe;B)V", + garbageValue = "0" ) - int method3586(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); - } + void method3674(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 529 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 530 + if (var6 != null && var6.length != 0) { // L: 531 + WorldMapDecoration[] var7 = var6; // L: 535 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 536 + WorldMapDecoration var9 = var7[var8]; // L: 537 + int var11 = var9.decoration; // L: 540 + boolean var10 = var11 >= WorldMapDecorationType.field3242.id && var11 <= WorldMapDecorationType.field3243.id; // L: 542 + if (var10 || class123.method2614(var9.decoration)) { // L: 544 + ObjectComposition var12 = KitDefinition.getObjectDefinition(var9.objectDefinitionId); // L: 545 + if (var12.mapSceneId != -1) { // L: 546 + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 547 + var4[var12.mapSceneId].method7362(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 551 + } else { + var4[var12.mapSceneId].method7362(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 548 + } + } + } + } + } + } + + } // L: 559 @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IILge;[Loz;B)V", - garbageValue = "-4" + descriptor = "(IILgl;B)V", + garbageValue = "107" ) - void method3594(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; - if (var6 != null && var6.length != 0) { - WorldMapDecoration[] var7 = var6; + void method3675(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 562 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 563 + if (var5 != null && var5.length != 0) { // L: 564 + WorldMapDecoration[] var6 = var5; // L: 568 - for (int var8 = 0; var8 < var7.length; ++var8) { - WorldMapDecoration var9 = var7[var8]; - if (!class326.method5928(var9.decoration)) { - int var11 = var9.decoration; - boolean var10 = var11 == WorldMapDecorationType.field3229.id; - if (!var10) { - continue; - } - } - - ObjectComposition var12 = class245.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method7274(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var12.mapSceneId].method7274(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); - } - } - } - } - } - - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IILge;I)V", - garbageValue = "-1072057008" - ) - void method3620(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; - if (var5 != null && var5.length != 0) { - WorldMapDecoration[] var6 = var5; - - for (int var7 = 0; var7 < var6.length; ++var7) { - WorldMapDecoration var8 = var6[var7]; - int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field3245.id && var10 <= WorldMapDecorationType.field3228.id || var10 == WorldMapDecorationType.field3250.id; - if (var9) { - ObjectComposition var11 = class245.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3245.id) { - this.method3684(var1, var2, var8.rotation, var12); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 569 + WorldMapDecoration var8 = var6[var7]; // L: 570 + int var10 = var8.decoration; // L: 573 + boolean var9 = var10 >= WorldMapDecorationType.field3238.id && var10 <= WorldMapDecorationType.field3230.id || var10 == WorldMapDecorationType.field3231.id; // L: 575 + if (var9) { // L: 577 + ObjectComposition var11 = KitDefinition.getObjectDefinition(var8.objectDefinitionId); // L: 578 + int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 579 + if (var8.decoration == WorldMapDecorationType.field3238.id) { // L: 580 + this.method3689(var1, var2, var8.rotation, var12); // L: 581 } - if (var8.decoration == WorldMapDecorationType.field3227.id) { - this.method3684(var1, var2, var8.rotation, -3355444); - this.method3684(var1, var2, var8.rotation + 1, var12); + if (var8.decoration == WorldMapDecorationType.field3224.id) { // L: 583 + this.method3689(var1, var2, var8.rotation, -3355444); // L: 584 + this.method3689(var1, var2, var8.rotation + 1, var12); // L: 585 } - if (var8.decoration == WorldMapDecorationType.field3228.id) { + if (var8.decoration == WorldMapDecorationType.field3230.id) { // L: 587 if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); // L: 588 } - if (var8.rotation == 1) { + if (var8.rotation == 1) { // L: 589 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); } - if (var8.rotation == 2) { + if (var8.rotation == 2) { // L: 590 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } - if (var8.rotation == 3) { + if (var8.rotation == 3) { // L: 591 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } } - if (var8.decoration == WorldMapDecorationType.field3250.id) { - int var13 = var8.rotation % 2; + if (var8.decoration == WorldMapDecorationType.field3231.id) { // L: 593 + int var13 = var8.rotation % 2; // L: 594 int var14; - if (var13 == 0) { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); + if (var13 == 0) { // L: 595 + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 596 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 597 } } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 601 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 602 } } } @@ -614,348 +749,294 @@ public class WorldMapRegion { } } - } + } // L: 611 - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "676465573" + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "-98" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; - float var6 = var5 / 2.0F; - Iterator var7 = this.iconMap.entrySet().iterator(); + float var5 = (float)var4 / 64.0F; // L: 614 + float var6 = var5 / 2.0F; // L: 615 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 616 while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); - Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); - if (var12 != null && var12.hasValidElement()) { - var12.screenX = var10; - var12.screenY = var11; - WorldMapElement var13 = class13.WorldMapElement_get(var12.getElement()); - if (!var3.contains(var13.getObjectId())) { - this.method3606(var12, var10, var11, var5); + Entry var8 = (Entry)var7.next(); // L: 617 + Coord var9 = (Coord)var8.getKey(); // L: 619 + int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); // L: 620 + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 621 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 622 + if (var12 != null && var12.hasValidElement()) { // L: 623 + var12.screenX = var10; // L: 624 + var12.screenY = var11; // L: 625 + WorldMapElement var13 = ItemComposition.WorldMapElement_get(var12.getElement()); // L: 626 + if (!var3.contains(var13.getObjectId())) { // L: 627 + this.method3666(var12, var10, var11, var5); // L: 628 } } } - } + } // L: 633 - @ObfuscatedName("n") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-2" + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "19259641" ) - void method3691(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); + void method3719(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 636 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - WorldMapElement var6 = class13.WorldMapElement_get(var5.getElement()); - if (var6 != null && var1.contains(var6.getObjectId())) { - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 637 + if (var5.hasValidElement()) { // L: 639 + WorldMapElement var6 = ItemComposition.WorldMapElement_get(var5.getElement()); // L: 640 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 641 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 642 } } } - } + } // L: 646 - @ObfuscatedName("u") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Leo;IIIII)V", - garbageValue = "1027799401" + descriptor = "(Len;IIIII)V", + garbageValue = "614726264" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - 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); + SpritePixels var6 = var1.getSpriteBool(false); // L: 649 + if (var6 != null) { // L: 650 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 653 + if (var4 % var5 < var5 / 2) { // L: 654 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 655 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 656 } } - } + } // L: 651 658 - @ObfuscatedName("d") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lgz;IIFI)V", - garbageValue = "-680055045" + descriptor = "(Lgm;IIFB)V", + garbageValue = "2" ) - void method3606(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class13.WorldMapElement_get(var1.getElement()); - this.method3592(var5, var2, var3); - this.method3667(var1, var5, var2, var3, var4); - } + void method3666(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = ItemComposition.WorldMapElement_get(var1.getElement()); // L: 661 + this.method3680(var5, var2, var3); // L: 662 + this.method3676(var1, var5, var2, var3, var4); // L: 663 + } // L: 664 - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Leo;III)V", - garbageValue = "1807859321" + descriptor = "(Len;III)V", + garbageValue = "-1236346843" ) - void method3592(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); - if (var4 != null) { - int var5 = this.method3678(var4, var1.horizontalAlignment); - int var6 = this.method3596(var4, var1.verticalAlignment); - var4.drawTransBgAt(var5 + var2, var3 + var6); + void method3680(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 667 + if (var4 != null) { // L: 668 + int var5 = this.method3683(var4, var1.horizontalAlignment); // L: 669 + int var6 = this.method3705(var4, var1.verticalAlignment); // L: 670 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 671 } - } + } // L: 673 - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lgz;Leo;IIFB)V", - garbageValue = "-52" + descriptor = "(Lgm;Len;IIFI)V", + garbageValue = "-1559767910" ) - void method3667(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); - if (var6 != null) { - if (var6.size.method3447(var5)) { - Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1630, 0, 1, 0, var7.ascent / 2); + void method3676(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 676 + if (var6 != null) { // L: 677 + if (var6.size.method3533(var5)) { // L: 680 + Font var7 = (Font)this.fonts.get(var6.size); // L: 683 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1626, 0, 1, 0, var7.ascent / 2); // L: 684 } } + } // L: 678 681 685 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1502655393" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 688 + Iterator var6 = this.icon0List.iterator(); // L: 689 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 690 + if (var7.hasValidElement()) { // L: 692 + int var8 = var7.coord2.x % 64; // L: 693 + int var9 = var7.coord2.y % 64; // L: 694 + var7.screenX = (int)((float)var1 + (float)var8 * var5); // L: 695 + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 696 + if (!var3.contains(var7.getElement())) { // L: 697 + this.method3666(var7, var7.screenX, var7.screenY, var5); // L: 700 + } + } + } + + } // L: 703 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Low;Lfj;B)I", + garbageValue = "13" + ) + int method3683(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 706 + case 0: + return 0; // L: 709 + case 1: + return -var1.subWidth / 2; // L: 717 + default: + return -var1.subWidth; // L: 713 + } } @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "-6" + descriptor = "(Low;Lfg;S)I", + garbageValue = "26323" ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; - Iterator var6 = this.icon0List.iterator(); - - while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); - if (var7.hasValidElement()) { - int var8 = var7.coord2.x % 64; - int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var8 * var5 + (float)var1); - var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); - if (!var3.contains(var7.getElement())) { - this.method3606(var7, var7.screenX, var7.screenY, var5); - } - } - } - - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lon;Lfp;I)I", - garbageValue = "-2067647941" - ) - int method3678(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { + int method3705(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 723 case 0: - return 0; + return -var1.subHeight / 2; // L: 734 case 2: - return -var1.subWidth / 2; + return 0; // L: 726 default: - return -var1.subWidth; + return -var1.subHeight; // L: 730 } } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(Lon;Lfz;B)I", - garbageValue = "49" - ) - int method3596(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { - case 0: - return 0; - case 1: - return -var1.subHeight / 2; - default: - return -var1.subHeight; - } - } - - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)Lga;", - garbageValue = "-1135574478" + garbageValue = "-302877736" ) - WorldMapLabel method3597(int var1) { - WorldMapElement var2 = class13.WorldMapElement_get(var1); - return this.createMapLabel(var2); + WorldMapLabel method3756(int var1) { + WorldMapElement var2 = ItemComposition.WorldMapElement_get(var1); // L: 740 + return this.createMapLabel(var2); // L: 741 } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Leo;I)Lga;", - garbageValue = "-1290616488" + descriptor = "(Len;B)Lga;", + garbageValue = "15" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - int var3 = var1.textSize; - WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_small, WorldMapLabelSize.WorldMapLabelSize_large}; - WorldMapLabelSize[] var5 = var4; - int var6 = 0; - - WorldMapLabelSize var2; - while (true) { - if (var6 >= var5.length) { - var2 = null; - break; - } - - WorldMapLabelSize var7 = var5[var6]; - if (var3 == var7.field2014) { - var2 = var7; - break; - } - - ++var6; - } - - if (var2 == null) { - return null; + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 745 + WorldMapLabelSize var2 = WorldMapLabelSize.method3538(var1.textSize); // L: 748 + if (var2 == null) { // L: 749 + return null; // L: 750 } else { - Font var14 = (Font)this.fonts.get(var2); - if (var14 == null) { - return null; + Font var3 = (Font)this.fonts.get(var2); // L: 752 + if (var3 == null) { // L: 753 + return null; // L: 754 } else { - var6 = var14.lineCount(var1.name, 1000000); - String[] var15 = new String[var6]; - var14.breakLines(var1.name, (int[])null, var15); - int var8 = var15.length * var14.ascent / 2; - int var9 = 0; - String[] var10 = var15; + int var4 = var3.lineCount(var1.name, 1000000); // L: 756 + String[] var5 = new String[var4]; // L: 757 + var3.breakLines(var1.name, (int[])null, var5); // L: 758 + int var6 = var5.length * var3.ascent / 2; // L: 759 + int var7 = 0; // L: 760 + String[] var8 = var5; // L: 762 - for (int var11 = 0; var11 < var10.length; ++var11) { - String var12 = var10[var11]; - int var13 = var14.stringWidth(var12); - if (var13 > var9) { - var9 = var13; + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 763 + String var10 = var8[var9]; // L: 764 + int var11 = var3.stringWidth(var10); // L: 766 + if (var11 > var7) { // L: 767 + var7 = var11; // L: 768 } } - return new WorldMapLabel(var1.name, var9, var8, var2); + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 773 } } } else { - return null; + return null; // L: 746 } } - @ObfuscatedName("ao") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "1288633441" + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "1" ) - List method3599(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); - if (var4 >= var1 && var5 >= var2) { - if (var4 < var3 + var1 && var5 < var3 + var2) { + List method3687(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 777 + if (var4 >= var1 && var5 >= var2) { // L: 778 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 779 Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; - while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + while (var7.hasNext()) { // L: 780 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 781 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 783 + var6.add(var8); // L: 784 } } - var7 = this.icon0List.iterator(); + var7 = this.icon0List.iterator(); // L: 788 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + var8 = (AbstractWorldMapIcon)var7.next(); // L: 789 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 791 + var6.add(var8); // L: 792 } } - return var6; + return var6; // L: 796 } else { - return var6; + return var6; // L: 787 } } else { return var6; } } - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(S)Ljava/util/List;", - garbageValue = "2247" + garbageValue = "-11615" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); - var1.addAll(this.icon0List); - var1.addAll(this.iconMap.values()); - return var1; + LinkedList var1 = new LinkedList(); // L: 800 + var1.addAll(this.icon0List); // L: 801 + var1.addAll(this.iconMap.values()); // L: 802 + return var1; // L: 803 } - @ObfuscatedName("aa") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1789376461" + descriptor = "(IIIIB)V", + garbageValue = "-18" ) - void method3684(int var1, int var2, int var3, int var4) { - var3 %= 4; - if (var3 == 0) { + void method3689(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 807 + if (var3 == 0) { // L: 808 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { + if (var3 == 1) { // L: 809 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { // L: 810 + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 811 } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BB)Lgw;", - garbageValue = "-41" - ) - static WorldMapSprite method3629(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(class135.convertJpgToSprite(var0).pixels); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILic;ZI)V", - garbageValue = "-1919439654" - ) - static void method3604(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = GrandExchangeEvent.getWorldMap().getMapArea(var0); - int var4 = class67.localPlayer.plane; - int var5 = (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX; - int var6 = (class67.localPlayer.y >> 7) + PlayerComposition.baseY; - Coord var7 = new Coord(var4, var5, var6); - GrandExchangeEvent.getWorldMap().method6537(var3, var7, var1, var2); - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(Ljt;I)I", - garbageValue = "2101402964" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.flags; - } + } // L: 812 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 0b079a3fdd..2ad4e580ec 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("ge") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("l") + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 460269771 + intValue = 811469011 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { - this.pixelsPerTile = var1; - } + this.pixelsPerTile = var1; // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "806412151" + garbageValue = "1525676958" ) - void method4009(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method3999(var8, var7); - var7 = this.method3976(var7); + void method4086(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.method4084(var8, var7); // L: 15 + var7 = this.method4065(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1935329101" + descriptor = "(IIB)I", + garbageValue = "44" ) - int method3999(int var1, int var2) { + int method4084(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -55,669 +61,797 @@ public class WorldMapScaleHandler { return var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "649131971" + garbageValue = "332241717" ) - int method3976(int var1) { - if (var1 != 9 && var1 != 10) { - return var1 == 11 ? 8 : var1; + int method4065(int var1) { + if (var1 != 9 && var1 != 10) { // L: 28 + return var1 == 11 ? 8 : var1; // L: 29 } else { - return 1; + return 1; // L: 30 } } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2085057846" - ) - @Export("init") - void init() { - 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(); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-871886733" - ) - @Export("init0") - void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][0] = 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][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("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1256743675" - ) - @Export("init1") - void init1() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[1][0] = 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 (var2 >= 0 && var2 < var1.length) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } else { - ++var2; - } - } - } - - this.tileTemplates[1][1] = 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[1][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[1][3] = var1; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1960858078" - ) - @Export("init2") - void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][0] = 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 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][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 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - 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("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-592698839" + garbageValue = "-139796910" ) - @Export("init3") - void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; + @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 + } + } // L: 35 46 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "6694" + ) + @Export("init0") + void init0() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 + int var2 = 0; // L: 50 int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { + 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; + ++var2; // L: 54 } } - this.tileTemplates[3][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][0] = var1; // L: 57 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 58 + var2 = 0; // L: 59 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 + 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; + ++var2; // L: 72 } } - this.tileTemplates[3][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][2] = var1; // L: 75 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 76 + var2 = 0; // L: 77 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 78 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 79 + if (var4 >= var3) { // L: 80 var1[var2] = -1; } - ++var2; + ++var2; // L: 81 } } - this.tileTemplates[3][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][3] = var1; // L: 84 + } // L: 85 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "478227481" + ) + @Export("init1") + void init1() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 + int var2 = 0; // L: 89 + + 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 var1[var2] = -1; } - ++var2; + ++var2; // L: 93 } } - this.tileTemplates[3][3] = var1; - } + this.tileTemplates[1][0] = var1; // L: 96 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 97 + var2 = 0; // L: 98 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 106 + } else { + ++var2; // L: 102 + } + } + } + + this.tileTemplates[1][1] = var1; // L: 109 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 + var2 = 0; // L: 111 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 115 + } + } + + this.tileTemplates[1][2] = var1; // L: 118 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 + var2 = 0; // L: 120 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 124 + } + } + + this.tileTemplates[1][3] = var1; // L: 127 + } // L: 128 @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "654314335" + ) + @Export("init2") + void init2() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 + int var2 = 0; // L: 132 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 136 + } + } + + this.tileTemplates[2][0] = var1; // L: 139 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 + var2 = 0; // L: 141 + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 + if (var4 >= var3 << 1) { + var1[var2] = -1; // L: 144 + } + + ++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 + } + } + + this.tileTemplates[2][2] = var1; // L: 157 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 + var2 = 0; // L: 159 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 163 + } + } + + this.tileTemplates[2][3] = var1; // L: 166 + } // L: 167 + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "27" + ) + @Export("init3") + void init3() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 + int var2 = 0; // L: 171 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 175 + } + } + + this.tileTemplates[3][0] = var1; // L: 178 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 179 + var2 = 0; // L: 180 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 181 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 182 + if (var4 <= var3 << 1) { // L: 183 + var1[var2] = -1; + } + + ++var2; // L: 184 + } + } + + this.tileTemplates[3][1] = var1; // L: 187 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 188 + var2 = 0; // L: 189 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 193 + } + } + + this.tileTemplates[3][2] = var1; // L: 196 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 197 + var2 = 0; // L: 198 + + 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 + var1[var2] = -1; + } + + ++var2; // L: 202 + } + } + + this.tileTemplates[3][3] = var1; // L: 205 + } // L: 206 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1406724170" ) @Export("init4") void init4() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 + int var2 = 0; // L: 210 int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { + 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 var1[var2] = -1; } - ++var2; + ++var2; // L: 214 } } - this.tileTemplates[4][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[4][0] = var1; // L: 217 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 218 + var2 = 0; // L: 219 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 + if (var4 <= var3 << 1) { // L: 222 var1[var2] = -1; } - ++var2; + ++var2; // L: 223 } } - this.tileTemplates[4][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[4][1] = var1; // L: 226 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 227 + var2 = 0; // L: 228 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 229 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 230 + if (var4 >= var3 >> 1) { // L: 231 var1[var2] = -1; } - ++var2; + ++var2; // L: 232 } } - this.tileTemplates[4][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[4][2] = var1; // L: 235 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 236 + var2 = 0; // L: 237 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { + 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 var1[var2] = -1; } - ++var2; + ++var2; // L: 241 } } - this.tileTemplates[4][3] = var1; - } + this.tileTemplates[4][3] = var1; // L: 244 + } // L: 245 - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1288253951" + garbageValue = "-1804052877" ) @Export("init5") void init5() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; + 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 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 255 } } - this.tileTemplates[5][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[5][0] = var1; // L: 258 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 259 + var5 = 0; // L: 260 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 <= this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 264 } } - this.tileTemplates[5][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[5][1] = var1; // L: 267 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 268 + var5 = 0; // L: 269 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 273 } } - this.tileTemplates[5][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[5][2] = var1; // L: 276 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 277 + var5 = 0; // L: 278 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 >= this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 282 } } - this.tileTemplates[5][3] = var1; - } + this.tileTemplates[5][3] = var1; // L: 285 + } // L: 286 - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "9" + garbageValue = "0" ) @Export("init6") void init6() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; + 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 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 296 } } - this.tileTemplates[6][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][0] = var1; // L: 299 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 300 + var5 = 0; // L: 301 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 305 } } - this.tileTemplates[6][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][1] = var1; // L: 308 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 309 + var5 = 0; // L: 310 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 314 } } - this.tileTemplates[6][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][2] = var1; // L: 317 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 318 + var5 = 0; // L: 319 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 323 } } - this.tileTemplates[6][3] = var1; - } + this.tileTemplates[6][3] = var1; // L: 326 + } // L: 327 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "62" + descriptor = "(I)V", + garbageValue = "-507566900" ) @Export("init7") void init7() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; + 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 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 337 } } - this.tileTemplates[7][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][0] = var1; // L: 340 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 341 + var5 = 0; // L: 342 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 346 } } - this.tileTemplates[7][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][1] = var1; // L: 349 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 350 + var5 = 0; // L: 351 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 355 } } - this.tileTemplates[7][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][2] = var1; // L: 358 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 359 + var5 = 0; // L: 360 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + 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 var1[var5] = -1; } - ++var5; + ++var5; // L: 364 } } - this.tileTemplates[7][3] = var1; + this.tileTemplates[7][3] = var1; // L: 367 + } // L: 368 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)J", + garbageValue = "-1513370360" + ) + static long method4096(CharSequence var0) { + long var1 = 0L; // L: 16 + int var3 = var0.length(); // L: 17 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 18 + var1 *= 37L; // L: 19 + char var5 = var0.charAt(var4); // L: 20 + if (var5 >= 'A' && var5 <= 'Z') { // L: 21 + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { // L: 22 + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { // L: 23 + var1 += (long)(var5 + 27 - 48); + } + + if (var1 >= 177917621779460413L) { // L: 24 + break; + } + } + + while (var1 % 37L == 0L && 0L != var1) { // L: 26 + var1 /= 37L; + } + + return var1; // L: 27 } - @ObfuscatedName("az") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1043186464" + descriptor = "(Lcp;IIII)V", + garbageValue = "-1638178326" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; // L: 9477 + if (Client.menuOptionsCount < 400) { // L: 9478 + if (var4.transforms != null) { // L: 9479 + var4 = var4.transform(); + } + + if (var4 != null) { // L: 9480 + if (var4.isInteractable) { // L: 9481 + if (!var4.isFollower || Client.followerIndex == var1) { // L: 9482 + String var5 = var4.name; // L: 9483 + int var6; + int var9; + if (var4.combatLevel != 0 && var0.field1145 != 0) { // L: 9484 + var6 = var0.field1145 != -1 ? var0.field1145 * -947188393 * 1234710119 : var4.combatLevel * -365575447 * 1462580569; // L: 9485 + var9 = HealthBarDefinition.localPlayer.combatLevel; // L: 9488 + int var10 = var9 - var6; // L: 9490 + String var8; + if (var10 < -9) { // L: 9491 + var8 = MouseHandler.colorStartTag(16711680); // L: 9492 + } else if (var10 < -6) { // L: 9495 + var8 = MouseHandler.colorStartTag(16723968); // L: 9496 + } else if (var10 < -3) { // L: 9499 + var8 = MouseHandler.colorStartTag(16740352); // L: 9500 + } else if (var10 < 0) { // L: 9503 + var8 = MouseHandler.colorStartTag(16756736); // L: 9504 + } else if (var10 > 9) { // L: 9507 + var8 = MouseHandler.colorStartTag(65280); // L: 9508 + } else if (var10 > 6) { // L: 9511 + var8 = MouseHandler.colorStartTag(4259584); // L: 9512 + } else if (var10 > 3) { // L: 9515 + var8 = MouseHandler.colorStartTag(8453888); // L: 9516 + } else if (var10 > 0) { // L: 9519 + var8 = MouseHandler.colorStartTag(12648192); // L: 9520 + } else { + var8 = MouseHandler.colorStartTag(16776960); // L: 9523 + } + + var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9525 + } + + if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9527 + EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9528 + } + + if (Client.isItemSelected == 1) { // L: 9531 + EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9532 + } else if (Client.isSpellSelected) { // L: 9535 + if ((class116.selectedSpellFlags & 2) == 2) { // L: 9536 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9537 + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9542 + String[] var7 = var4.actions; // L: 9543 + int var11; + if (var7 != null) { // L: 9544 + for (var11 = 4; var11 >= 0; --var11) { // L: 9545 + if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9546 + var9 = 0; // L: 9547 + if (var11 == 0) { // L: 9548 + var9 = var6 + 9; + } + + if (var11 == 1) { // L: 9549 + var9 = var6 + 10; + } + + if (var11 == 2) { // L: 9550 + var9 = var6 + 11; + } + + if (var11 == 3) { // L: 9551 + var9 = var6 + 12; + } + + if (var11 == 4) { // L: 9552 + var9 = var6 + 13; + } + + EnumComposition.insertMenuItemNoShift(var7[var11], MouseHandler.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9553 + } + } + } + + if (var7 != null) { // L: 9558 + for (var11 = 4; var11 >= 0; --var11) { // L: 9559 + if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9560 + short var12 = 0; // L: 9561 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9562 + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > HealthBarDefinition.localPlayer.combatLevel) { // L: 9563 + var12 = 2000; // L: 9564 + } + + var9 = 0; // L: 9566 + if (var11 == 0) { // L: 9567 + var9 = var12 + 9; + } + + if (var11 == 1) { // L: 9568 + var9 = var12 + 10; + } + + if (var11 == 2) { // L: 9569 + var9 = var12 + 11; + } + + if (var11 == 3) { // L: 9570 + var9 = var12 + 12; + } + + if (var11 == 4) { // L: 9571 + var9 = var12 + 13; + } + + EnumComposition.insertMenuItemNoShift(var7[var11], MouseHandler.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9572 + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9577 + EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9578 + } + } - 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; - SoundSystem.runScript(var4, 5000000, 0); } } - } } - } + } // L: 9582 - @ObfuscatedName("ga") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "89" + descriptor = "(Ljf;IIZB)V", + garbageValue = "-94" ) - static final void method4005(int var0, int var1) { - if (Client.hintArrowType == 2) { - class124.worldToScreen((Client.hintArrowX - WorldMapSectionType.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - PlayerComposition.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - UserComparator4.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - - } - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "2084685303" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < class17.ItemDefinition_fileCount; ++var4) { - ItemComposition var9 = class87.ItemDefinition_get(var4); - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - WorldMapAreaData.foundItemIdCount = -1; - ObjectComposition.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; - } + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10259 + int var5 = var0.height; // L: 10260 + if (var0.widthAlignment == 0) { // L: 10261 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10262 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10263 + var0.width = var0.rawWidth * var1 >> 14; } - ObjectComposition.foundItemIds = var2; - GraphicsObject.foundItemIndex = 0; - WorldMapAreaData.foundItemIdCount = var3; - String[] var8 = new String[WorldMapAreaData.foundItemIdCount]; - - for (int var5 = 0; var5 < WorldMapAreaData.foundItemIdCount; ++var5) { - var8[var5] = class87.ItemDefinition_get(var2[var5]).name; + if (var0.heightAlignment == 0) { // L: 10264 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10265 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; // L: 10266 } - short[] var10 = ObjectComposition.foundItemIds; - class281.sortItemsByName(var8, var10, 0, var8.length - 1); - } + if (var0.widthAlignment == 4) { // L: 10267 + var0.width = var0.field3068 * var0.height / var0.field3069; + } + + if (var0.heightAlignment == 4) { // L: 10268 + var0.height = var0.width * var0.field3069 / var0.field3068; + } + + if (var0.contentType == 1337) { // L: 10269 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10270 + ScriptEvent var6 = new ScriptEvent(); // L: 10271 + var6.widget = var0; // L: 10272 + var6.args = var0.onResize; // L: 10273 + Client.scriptEvents.addFirst(var6); // L: 10274 + } + + } // L: 10276 } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 47e21e2a80..0b2b8d7cf3 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gx") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "2018229058" + descriptor = "(Lfb;I)V", + garbageValue = "-1844012640" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-964071790" + garbageValue = "-1501827396" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "381612084" + garbageValue = "-356013678" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIB)[I", - garbageValue = "88" + garbageValue = "-79" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "2033247854" + descriptor = "(III)Lie;", + garbageValue = "494177498" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "4" + descriptor = "(Lop;I)V", + garbageValue = "-682362313" ) @Export("read") void read(Buffer var1); diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index a691129704..c92538aa7a 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -1,116 +1,108 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gs") +@ObfuscatedName("gn") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "Lcj;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 26129547 + intValue = 272991891 ) @Export("oldZ") int oldZ; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -867337437 + intValue = 754094051 ) @Export("newZ") int newZ; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 847593195 + intValue = -644010773 ) @Export("oldX") int oldX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -308984415 + intValue = 1805234219 ) @Export("oldY") int oldY; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 276591907 + intValue = -1829364501 ) @Export("newX") int newX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1307815303 + intValue = 2048396349 ) @Export("newY") int newY; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1009384651 + intValue = 1973016615 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1044972979 + intValue = -1669534475 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1528547923 + intValue = -1580023959 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 493876669 + intValue = -1163870055 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1984300227 + intValue = 1236846997 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1261005687 + intValue = 808496867 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 998230359 + intValue = -1728394355 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1441950703 + intValue = -981337131 ) @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { - } + } // L: 22 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "2018229058" + descriptor = "(Lfb;I)V", + garbageValue = "-1844012640" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { + if (var1.regionLowX > this.newX) { // L: 25 var1.regionLowX = this.newX; } @@ -126,467 +118,117 @@ public class WorldMapSection0 implements WorldMapSection { var1.regionHighY = this.newY; } - } + } // L: 29 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-964071790" + garbageValue = "-1501827396" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { - return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32 + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 } else { - return false; + return false; // L: 33 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "381612084" + garbageValue = "-356013678" ) @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; + return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIB)[I", - garbageValue = "88" + garbageValue = "-79" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 } else { - int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; - return var4; + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 + return var4; // L: 49 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "2033247854" + descriptor = "(III)Lie;", + garbageValue = "494177498" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); - return new Coord(this.oldZ, var3, var4); + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 + return new Coord(this.oldZ, var3, var4); // L: 58 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "4" + descriptor = "(Lop;I)V", + garbageValue = "-682362313" ) @Export("read") public void read(Buffer var1) { - 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(); - } + this.oldZ = var1.readUnsignedByte(); // L: 62 + this.newZ = var1.readUnsignedByte(); // L: 63 + this.oldX = var1.readUnsignedShort(); // L: 64 + this.oldChunkXLow = var1.readUnsignedByte(); // L: 65 + this.oldChunkXHigh = var1.readUnsignedByte(); // L: 66 + this.oldY = var1.readUnsignedShort(); // L: 67 + this.oldChunkYLow = var1.readUnsignedByte(); // L: 68 + this.oldChunkYHigh = var1.readUnsignedByte(); // L: 69 + this.newX = var1.readUnsignedShort(); // L: 70 + this.newChunkXLow = var1.readUnsignedByte(); // L: 71 + this.newChunkXHigh = var1.readUnsignedByte(); // L: 72 + this.newY = var1.readUnsignedShort(); // L: 73 + this.newChunkYLow = var1.readUnsignedByte(); // L: 74 + this.newChunkYHigh = var1.readUnsignedByte(); // L: 75 + this.postRead(); // L: 76 + } // L: 77 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1980100595" + garbageValue = "-1539376631" ) @Export("postRead") void postRead() { - } + } // L: 79 - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "582127125" + descriptor = "(II)V", + garbageValue = "714098050" ) - static final void method3824(String var0) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-1293981201" - ) - static int method3826(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { - if (class114.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - ModeWhere.field3804 = class114.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; + public static void method3917(int var0) { + if (class247.musicPlayerStatus != 0) { // L: 26 + class247.musicTrackVolume = var0; } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - ModeWhere.field3804 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ModeWhere.field3804.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.allowGuests ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1450; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1452; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1459; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1466; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.memberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ModeWhere.field3804.memberNames[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.memberRanks[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.bannedMemberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ModeWhere.field3804.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.method2585(var3, var6, var5); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.currentOwner; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1451; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.method2584(Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.getSortedMembers()[Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - PacketWriter.method2375(var6, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1460[var3]; - return 1; - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - class111.method2467(var5, var3, var4); - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ModeWhere.field3804.field1461[var3] ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { - if (GrandExchangeOfferNameComparator.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - BuddyRankComparator.field1347 = GrandExchangeOfferNameComparator.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - BuddyRankComparator.field1347 = Client.currentClanChannels[var3]; - PacketWriter.field1285 = var3; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = BuddyRankComparator.field1347.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = BuddyRankComparator.field1347.field1512; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = BuddyRankComparator.field1347.field1517; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = BuddyRankComparator.field1347.method2729(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ((ClanChannelMember)BuddyRankComparator.field1347.members.get(var3)).username.getName(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((ClanChannelMember)BuddyRankComparator.field1347.members.get(var3)).rank; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((ClanChannelMember)BuddyRankComparator.field1347.members.get(var3)).world; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class275.method5121(PacketWriter.field1285, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = BuddyRankComparator.field1347.method2739(Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { - Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1] = BuddyRankComparator.field1347.getSortedMembers()[Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Coord.field3013 != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } + class247.midiPcmStream.setPcmStreamVolume(var0); // L: 27 } - } - @ObfuscatedName("ay") + } // L: 28 + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "84538647" + descriptor = "(Lko;III)Low;", + garbageValue = "-1166598704" ) - static int method3827(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { - class54.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3 + class14.intToString(var9, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - long var13 = ((long)var10 + 11745L) * 86400000L; - 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[++class54.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[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - class54.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = MidiPcmStream.method4815(MusicPatchPcmStream.compareStrings(Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1], ReflectionCheck.clientLanguage)); - return 1; - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var11 = class54.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var11 = class54.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - class54.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3 + (char)var9; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = KeyHandler.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class133.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class65.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - StringBuilder var15 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var15.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.indexOf(var9); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - class54.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - class54.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class54.Interpreter_stringStackSize + 1]; - if (class67.localPlayer.appearance != null && class67.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } - } - } - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "33887552" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !BuddyRankComparator.method2502(var0, var1, var2) ? null : ItemLayer.method4107(); // L: 53 54 } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 32416421a8..a1af073e68 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -3,197 +3,233 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gy") +@ObfuscatedName("gf") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("l") + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "[[Ljf;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("ff") + static String field2203; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1921792767 + intValue = 627592207 ) @Export("minPlane") int minPlane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1540557989 + intValue = 1419661361 ) @Export("planes") int planes; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 50051199 + intValue = 1032024163 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -625671383 + intValue = -1425416297 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 345047229 + intValue = -605929777 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -598803681 + intValue = 1140960947 ) @Export("regionEndY") int regionEndY; WorldMapSection1() { - } + } // L: 14 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "2018229058" + descriptor = "(Lfb;I)V", + garbageValue = "-1844012640" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { + if (var1.regionLowX > this.regionEndX) { // L: 17 var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; + var1.regionHighX = this.regionEndX; // L: 18 } - if (var1.regionLowY > this.regionEndY) { + if (var1.regionLowY > this.regionEndY) { // L: 19 var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { + if (var1.regionHighY < this.regionEndY) { // L: 20 var1.regionHighY = this.regionEndY; } - } + } // L: 21 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-964071790" + garbageValue = "-1501827396" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24 + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27 } else { - return false; + return false; // L: 25 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "381612084" + garbageValue = "-356013678" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIB)[I", - garbageValue = "88" + garbageValue = "-79" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; + if (!this.containsCoord(var1, var2, var3)) { // L: 35 + return null; // L: 36 } else { - int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; - return var4; + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 38 39 40 + return var4; // L: 41 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "2033247854" + descriptor = "(III)Lie;", + garbageValue = "494177498" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 45 + return null; // L: 46 } else { - 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); + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48 + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49 + return new Coord(this.minPlane, var3, var4); // L: 50 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "4" + descriptor = "(Lop;I)V", + garbageValue = "-682362313" ) @Export("read") public void read(Buffer var1) { - 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(); - } + this.minPlane = var1.readUnsignedByte(); // L: 54 + this.planes = var1.readUnsignedByte(); // L: 55 + this.regionStartX = var1.readUnsignedShort(); // L: 56 + this.regionStartY = var1.readUnsignedShort(); // L: 57 + this.regionEndX = var1.readUnsignedShort(); // L: 58 + this.regionEndY = var1.readUnsignedShort(); // L: 59 + this.postRead(); // L: 60 + } // L: 61 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "51" + garbageValue = "124" ) @Export("postRead") void postRead() { - } + } // L: 63 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)J", - garbageValue = "1118875109" + descriptor = "(ILbp;ZB)I", + garbageValue = "-4" ) - public static long method3912(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "([Ljt;IIIZB)V", - garbageValue = "3" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - WorldMapEvent.alignWidgetSize(var6, var2, var3, var4); - HorizontalAlignment.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } - - if (var6.type == 0) { - TaskHandler.revalidateWidgetScroll(var0, var6, var4); - } - } + static int method3999(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1116 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1117 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1118 + return 1; // L: 1119 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1121 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1122 + return 1; // L: 1123 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1125 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.text; // L: 1126 + return 1; // L: 1127 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1129 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1130 + return 1; // L: 1131 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1133 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1134 + return 1; // L: 1135 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1137 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1138 + return 1; // L: 1139 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1141 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1142 + return 1; // L: 1143 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1145 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1146 + return 1; // L: 1147 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1149 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1150 + return 1; // L: 1151 + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1153 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1154 + return 1; // L: 1155 + } else if (var0 == 1610) { // L: 1157 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1158 + return 1; // L: 1159 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1161 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color; // L: 1162 + return 1; // L: 1163 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1165 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color2; // L: 1166 + return 1; // L: 1167 + } else if (var0 == 1613) { // L: 1169 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1170 + return 1; // L: 1171 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1173 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1174 + return 1; // L: 1175 + } else if (var0 != 1615 && var0 != 1616) { // L: 1177 + return 2; // L: 1181 + } else { + ++class14.Interpreter_intStackSize; // L: 1178 + return 1; // L: 1179 } - } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "209576607" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11403 + class408.clientPreferences.soundEffectsVolume = var0; // L: 11404 + Login.savePreferences(); // L: 11405 + } // L: 11406 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 876029fbac..2d4f9fbe74 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,175 +4,194 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fx") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("l") + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "Ljf;" + ) + static Widget field2037; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 739106677 + intValue = 268471801 ) @Export("minPlane") int minPlane; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1981198519 + intValue = -2064297275 ) @Export("planes") int planes; - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 126525707 + intValue = 120844139 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2091786471 + intValue = 307764911 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1494547721 + intValue = 1741263817 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1240041779 + intValue = -1879263737 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -677400595 - ) - int field2031; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 156542557 - ) - int field2038; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1002795527 + intValue = -829160943 ) - int field2039; - @ObfuscatedName("i") + int field2033; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1479791309 + intValue = 2138355431 ) - int field2037; + int field2028; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1057428701 + ) + int field2026; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1043419133 + ) + int field2035; WorldMapSection2() { - } + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "2018229058" + descriptor = "(Lfb;I)V", + garbageValue = "-1844012640" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2031) { - var1.regionLowX = this.field2031; + if (var1.regionLowX > this.field2033) { // L: 21 + var1.regionLowX = this.field2033; } - if (var1.regionHighX < this.field2039) { - var1.regionHighX = this.field2039; + if (var1.regionHighX < this.field2026) { + var1.regionHighX = this.field2026; // L: 22 } - if (var1.regionLowY > this.field2038) { - var1.regionLowY = this.field2038; + if (var1.regionLowY > this.field2028) { // L: 23 + var1.regionLowY = this.field2028; } - if (var1.regionHighY < this.field2037) { - var1.regionHighY = this.field2037; + if (var1.regionHighY < this.field2035) { // L: 24 + var1.regionHighY = this.field2035; } - } + } // L: 25 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-964071790" + garbageValue = "-1501827396" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { - return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 28 + return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31 } else { - return false; + return false; // L: 29 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "381612084" + garbageValue = "-356013678" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2031 && var1 >> 6 <= this.field2039 && var2 >> 6 >= this.field2038 && var2 >> 6 <= this.field2037; + return var1 >> 6 >= this.field2033 && var1 >> 6 <= this.field2026 && var2 >> 6 >= this.field2028 && var2 >> 6 <= this.field2035; // L: 35 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIB)[I", - garbageValue = "88" + garbageValue = "-79" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field2031 * 64 - this.regionStartX * 64), var3 + (this.field2038 * 64 - this.regionStartY * 64)}; - return var4; + int[] var4 = new int[]{var2 + (this.field2033 * 64 - this.regionStartX * 64), var3 + (this.field2028 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + return var4; // L: 45 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "2033247854" + descriptor = "(III)Lie;", + garbageValue = "494177498" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field2031 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field2038 * 64); - return new Coord(this.minPlane, var3, var4); + int var3 = this.regionStartX * 64 - this.field2033 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field2028 * 64); // L: 53 + return new Coord(this.minPlane, var3, var4); // L: 54 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "4" + descriptor = "(Lop;I)V", + garbageValue = "-682362313" ) @Export("read") public void read(Buffer var1) { - 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.field2031 = var1.readUnsignedShort(); - this.field2038 = var1.readUnsignedShort(); - this.field2039 = var1.readUnsignedShort(); - this.field2037 = var1.readUnsignedShort(); - this.postRead(); - } + this.minPlane = var1.readUnsignedByte(); // L: 58 + this.planes = var1.readUnsignedByte(); // L: 59 + this.regionStartX = var1.readUnsignedShort(); // L: 60 + this.regionStartY = var1.readUnsignedShort(); // L: 61 + this.regionEndX = var1.readUnsignedShort(); // L: 62 + this.regionEndY = var1.readUnsignedShort(); // L: 63 + this.field2033 = var1.readUnsignedShort(); // L: 64 + this.field2028 = var1.readUnsignedShort(); // L: 65 + this.field2026 = var1.readUnsignedShort(); // L: 66 + this.field2035 = var1.readUnsignedShort(); // L: 67 + this.postRead(); // L: 68 + } // L: 69 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1532243849" + garbageValue = "-1513297237" ) @Export("postRead") void postRead() { - } + } // L: 71 + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "14" + ) + static final void method3584(boolean var0) { + if (var0) { // L: 3286 + Client.field693 = Login.field875 ? class112.field1345 : class112.field1347; // L: 3287 + } else { + Client.field693 = class408.clientPreferences.parameters.containsKey(ClanChannel.method2824(Login.Login_username)) ? class112.field1350 : class112.field1346; // L: 3290 + } + + } // L: 3292 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 24038f8277..83a3a513c6 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,143 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gc") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgc;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("q") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgc;" ) @Export("WORLDMAPSECTIONTYPE1") WORLDMAPSECTIONTYPE1(1, (byte)1), - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgc;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("j") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgc;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("qm") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("fm") - static String field2140; - @ObfuscatedName("gn") + @ObfuscatedName("au") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = 356488237 + intValue = 1073689221 ) - @Export("baseX") - static int baseX; - @ObfuscatedName("m") + @Export("cameraX") + static int cameraX; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1222085259 + intValue = -637994723 ) @Export("type") final int type; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; - this.id = var4; - } + this.type = var3; // L: 17 + this.id = var4; // L: 18 + } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 22 } - @ObfuscatedName("gv") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "104390740" + descriptor = "(III)I", + garbageValue = "1484599212" ) - static final void method3830(int var0) { - int[] var1 = class11.sceneMinimapSprite.pixels; - int var2 = var1.length; + static int method3920(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 + if (var2 == null) { // L: 29 + return 0; + } else if (var1 == -1) { // L: 30 + return 0; + } else { + int var3 = 0; // L: 31 - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; - - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - PlayerComposition.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - PlayerComposition.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - class11.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - class138.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - class138.drawObject(var0 + 1, var6, var5, var3, var4); + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 } } + + return var3; // L: 35 } - - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = PlayerComposition.scene.getFloorDecorationTag(VertexNormal.Client_plane, var5, var6); - if (0L != var7) { - int var9 = InterfaceParent.Entity_unpackID(var7); - int var10 = class245.getObjectDefinition(var9).mapIconId; - if (var10 >= 0 && class13.WorldMapElement_get(var10).field1634) { - Client.mapIcons[Client.mapIconCount] = class13.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; - } - } - } - } - - class244.rasterProvider.apply(); } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 34df1ede89..652978ebe8 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -2,104 +2,29 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gw") +@ObfuscatedName("gg") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("tileColors") final int[] tileColors; WorldMapSprite() { - this.tileColors = new int[4096]; - } + this.tileColors = new int[4096]; // L: 11 + } // L: 12 WorldMapSprite(int[] var1) { - this.tileColors = var1; - } + this.tileColors = var1; // L: 15 + } // L: 16 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "214577413" + garbageValue = "1338701397" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "523339121" - ) - static int method3866(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { - var7 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); - Interpreter.field830.add(var8); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 3; - int var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - if (var5 >= 1 && var5 <= 10) { - class92 var6 = new class92(var5, var3, var4, HealthBarUpdate.getWidget(var3).itemId); - Interpreter.field830.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; - } - } else if (Interpreter.field818 >= 10) { - throw new RuntimeException(); - } else { - if (var0 >= 2000) { - var7 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - } else { - var7 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - if (var7.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var7; - var9.args = var7.onResize; - var9.field1037 = Interpreter.field818 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } - } - } - - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1445604382" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field663) { - class247.midiPcmStream.clear(); - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = null; - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && WorldMapDecorationType.clientPreferences.musicVolume != 0 && !Client.field663) { - VertexNormal.method4560(2, Tiles.archive6, var0, 0, WorldMapDecorationType.clientPreferences.musicVolume, false); - } - - Client.currentTrackGroupId = var0; + return this.tileColors[var1 + var2 * 64]; // L: 41 } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 4f75e5566a..4be2802422 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,22 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ik") +@ObfuscatedName("in") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("size") final int size; Wrapper(int var1) { - this.size = var1; - } + this.size = var1; // L: 9 + } // L: 10 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("get") abstract Object get(); - @ObfuscatedName("q") + @ObfuscatedName("w") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index ebeec46d93..11ede2a875 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,33 +1,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("i") public class class0 implements class3 { - class0() { + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;)Lop;" + ) + public Buffer vmethod18(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 9 + this.method7(var1, var2); // L: 10 + return var2; // L: 11 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;)Lot;" + descriptor = "(Lop;Lop;)V" ) - public Buffer vmethod15(Buffer var1) { - Buffer var2 = new Buffer(100); - this.method3(var1, var2); - return var2; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lot;Lot;)V" - ) - void method3(Buffer var1, Buffer var2) { - class8 var3 = new class8(var1); - class5 var4 = new class5(var3); + void method7(Buffer var1, Buffer var2) { + class8 var3 = new class8(var1); // L: 15 + class5 var4 = new class5(var3); // L: 16 long var5; - for (var5 = 0L; !var4.method25(var3.method68(), var3.method67(), var5); ++var5) { + for (var5 = 0L; !var4.method22(var3.method64(), var3.method60(), var5); ++var5) { // L: 17 18 19 } - var2.writeLong(var5); - } + var2.writeLong(var5); // L: 21 + } // L: 22 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index ac71fa0ef2..f8dfa7f311 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,151 +1,312 @@ -import java.awt.Image; import java.io.InputStream; import java.io.OutputStreamWriter; import java.net.URL; import java.net.URLConnection; +import java.util.Random; import java.util.concurrent.Callable; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("w") public class class1 implements Callable { - @ObfuscatedName("au") - static Image field3; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lot;" + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1698122621 ) - final Buffer field1; - @ObfuscatedName("q") + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + @ObfuscatedName("k") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lkd;" ) - final class3 field4; - // $FF: synthetic field + @Export("archive2") + static Archive archive2; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + final Buffer field3; + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "La;" ) + final class3 field1; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lp;" + ) final class7 this$0; @ObfuscatedSignature( - descriptor = "(La;Lot;Lj;)V" + descriptor = "(Lp;Lop;La;)V" ) class1(class7 var1, Buffer var2, class3 var3) { - this.this$0 = var1; - this.field1 = var2; - this.field4 = var3; - } + this.this$0 = var1; // L: 47 + this.field3 = var2; // L: 48 + this.field1 = var3; // L: 49 + } // L: 50 public Object call() { - return this.field4.vmethod15(this.field1); + return this.field1.vmethod18(this.field3); // L: 53 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IB)Lbe;", - garbageValue = "-96" + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "284961543" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = UserComparator6.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = GrandExchangeOfferOwnWorldComparator.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } + static final int method15(long var0, String var2) { + Random var3 = new Random(); // L: 65 + Buffer var4 = new Buffer(128); // L: 66 + Buffer var5 = new Buffer(128); // L: 67 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72 + var4.writeByte(10); // L: 73 + + int var7; + for (var7 = 0; var7 < 4; ++var7) { // L: 74 + var4.writeInt(var3.nextInt()); // L: 75 } - } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1037014776" - ) - static void method13() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } + var4.writeInt(var6[0]); // L: 77 + var4.writeInt(var6[1]); // L: 78 + var4.writeLong(var0); // L: 79 + var4.writeLong(0L); // L: 80 - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "182768173" - ) - static void method14() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class17.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + for (var7 = 0; var7 < 4; ++var7) { // L: 81 + var4.writeInt(var3.nextInt()); // L: 82 + } + + var4.encryptRsa(class65.field822, class65.field823); // L: 84 + var5.writeByte(10); // L: 85 + + for (var7 = 0; var7 < 3; ++var7) { // L: 86 + var5.writeInt(var3.nextInt()); // L: 87 + } + + var5.writeLong(var3.nextLong()); // L: 89 + var5.writeLongMedium(var3.nextLong()); // L: 90 + if (Client.randomDatData != null) { // L: 92 + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 93 } else { - long var1; - try { - URL var3 = new URL(HitSplatDefinition.method3168("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]); + byte[] var23 = ObjectSound.method1771(); // L: 96 + var5.writeBytes(var23, 0, var23.length); // L: 97 + } - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 == -1) { - var7.offset = 0; - long var10 = var7.readLong(); - var1 = var10; - break; + var5.writeLong(var3.nextLong()); // L: 99 + var5.encryptRsa(class65.field822, class65.field823); // L: 100 + var7 = Client.stringCp1252NullTerminatedByteSize(var2); // L: 101 + if (var7 % 8 != 0) { // L: 102 + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); // L: 103 + var8.writeStringCp1252NullTerminated(var2); // L: 104 + var8.offset = var7; // L: 105 + var8.xteaEncryptAll(var6); // L: 106 + Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); // L: 107 + var9.writeByte(2); // L: 108 + var9.writeByte(var4.offset); // L: 109 + var9.writeBytes(var4.array, 0, var4.offset); // L: 110 + var9.writeByte(var5.offset); // L: 111 + var9.writeBytes(var5.array, 0, var5.offset); // L: 112 + var9.writeShort(var8.offset); // L: 113 + var9.writeBytes(var8.array, 0, var8.offset); // L: 114 + String var10 = class114.method2545(var9.array); // L: 115 + + try { + URL var11 = new URL(HealthBar.method2246("services", false) + "m=accountappeal/login.ws"); // L: 117 + URLConnection var12 = var11.openConnection(); // L: 118 + var12.setDoInput(true); // L: 119 + var12.setDoOutput(true); // L: 120 + var12.setConnectTimeout(5000); // L: 121 + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 122 + String var15 = "data2=" + class355.method6403(var10) + "&dest="; // L: 124 + int var17 = "passwordchoice.ws".length(); // L: 127 + StringBuilder var18 = new StringBuilder(var17); // L: 128 + + for (int var19 = 0; var19 < var17; ++var19) { // L: 129 + char var20 = "passwordchoice.ws".charAt(var19); // L: 130 + if ((var20 < 'a' || var20 > 'z') && (var20 < 'A' || var20 > 'Z') && (var20 < '0' || var20 > '9') && var20 != '.' && var20 != '-' && var20 != '*' && var20 != '_') { // L: 131 + if (var20 == ' ') { // L: 132 + var18.append('+'); + } else { + byte var21 = AbstractSocket.charToByteCp1252(var20); // L: 134 + var18.append('%'); // L: 135 + int var22 = var21 >> 4 & 15; // L: 136 + if (var22 >= 10) { // L: 137 + var18.append((char)(var22 + 55)); + } else { + var18.append((char)(var22 + 48)); // L: 138 + } + + var22 = var21 & 15; // L: 139 + if (var22 >= 10) { // L: 140 + var18.append((char)(var22 + 55)); + } else { + var18.append((char)(var22 + 48)); // L: 141 + } } + } else { + var18.append(var20); + } + } - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; + String var16 = var18.toString(); // L: 144 + var13.write(var15 + var16); // L: 146 + var13.flush(); // L: 147 + InputStream var24 = var12.getInputStream(); // L: 148 + var9 = new Buffer(new byte[1000]); // L: 149 + + do { + int var25 = var24.read(var9.array, var9.offset, 1000 - var9.offset); // L: 151 + if (var25 == -1) { // L: 152 + var13.close(); // L: 158 + var24.close(); // L: 159 + String var27 = new String(var9.array); // L: 160 + if (var27.startsWith("OFFLINE")) { // L: 161 + return 4; // L: 162 + } else if (var27.startsWith("WRONG")) { // L: 164 + return 7; // L: 165 + } else if (var27.startsWith("RELOAD")) { // L: 167 + return 3; // L: 168 + } else if (var27.startsWith("Not permitted for social network accounts.")) { // L: 170 + return 6; // L: 171 + } else { + var9.xteaDecryptAll(var6); // L: 173 + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 174 + --var9.offset; // L: 175 + } + + var27 = new String(var9.array, 0, var9.offset); // L: 177 + if (Occluder.method4484(var27)) { // L: 178 + class91.openURL(var27, true, false); // L: 179 + return 2; // L: 180 + } else { + return 5; // L: 182 + } } } - } catch (Exception var14) { - var1 = 0L; - } - int var0; - if (0L == var1) { - var0 = 5; + var9.offset += var25; // L: 153 + } while(var9.offset < 1000); // L: 154 + + return 5; // L: 155 + } catch (Throwable var26) { // L: 184 + var26.printStackTrace(); // L: 185 + return 5; // L: 186 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "207642979" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 861 + Login.Login_response2 = "Enter your username/email & password."; // L: 862 + Login.Login_response3 = ""; // L: 863 + class275.method5201(2); // L: 864 + if (var0) { // L: 865 + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 867 + if (class408.clientPreferences.rememberedUsername != null) { // L: 868 + Login.Login_username = class408.clientPreferences.rememberedUsername; // L: 869 + Client.Login_isUsernameRemembered = true; // L: 870 } else { - var0 = UserComparator8.method2413(var1, Login.Login_username); + Client.Login_isUsernameRemembered = false; // L: 872 + } + } + + ParamComposition.method3216(); // L: 874 + } // L: 875 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2113911304" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1507 + Login.Login_response2 = var1; // L: 1508 + Login.Login_response3 = var2; // L: 1509 + } // L: 1510 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljf;II)V", + garbageValue = "217206746" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3180 == null) { // L: 1007 + throw new RuntimeException(); // L: 1008 + } else { + if (var0.field3194 == null) { // L: 1010 + var0.field3194 = new int[var0.field3180.length]; // L: 1011 } - switch(var0) { - case 2: - class17.setLoginResponseString(Strings.field3604, Strings.field3351, Strings.field3606); - class112.method2474(6); - break; - case 3: - class17.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - class17.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - class17.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - class17.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - class17.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."); + var0.field3194[var1] = Integer.MAX_VALUE; // L: 1013 + } + } // L: 1014 + + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(Ljf;III)V", + garbageValue = "-989741563" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 4115 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 4116 + SpriteMask var3 = var0.getSpriteMask(true); // L: 4117 + if (var3 == null) { // L: 4118 + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 4119 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 4120 + if (var3.contains(var4, var5)) { // L: 4121 + var4 -= var3.width / 2; // L: 4122 + var5 -= var3.height / 2; // L: 4123 + int var6 = Client.camAngleY & 2047; // L: 4124 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 4125 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 4126 + int var9 = var4 * var8 + var7 * var5 >> 11; // L: 4127 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 4128 + int var11 = var9 + HealthBarDefinition.localPlayer.x >> 7; // L: 4129 + int var12 = HealthBarDefinition.localPlayer.y - var10 >> 7; // L: 4130 + PacketBufferNode var13 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2749, Client.packetWriter.isaacCipher); // L: 4132 + var13.packetBuffer.writeByte(18); // L: 4133 + var13.packetBuffer.method6962(var11 + class19.baseX); // L: 4134 + var13.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4135 + var13.packetBuffer.method7003(var12 + DefaultsGroup.baseY); // L: 4136 + var13.packetBuffer.writeByte(var4); // L: 4137 + var13.packetBuffer.writeByte(var5); // L: 4138 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 4139 + var13.packetBuffer.writeByte(57); // L: 4140 + var13.packetBuffer.writeByte(0); // L: 4141 + var13.packetBuffer.writeByte(0); // L: 4142 + var13.packetBuffer.writeByte(89); // L: 4143 + var13.packetBuffer.writeShort(HealthBarDefinition.localPlayer.x); // L: 4144 + var13.packetBuffer.writeShort(HealthBarDefinition.localPlayer.y); // L: 4145 + var13.packetBuffer.writeByte(63); // L: 4146 + Client.packetWriter.addNode(var13); // L: 4147 + Client.destinationX = var11; // L: 4148 + Client.destinationY = var12; // L: 4149 + } } } - } + } // L: 4152 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index a6b0067306..523c1f23c3 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -11,230 +11,201 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import javax.net.ssl.HttpsURLConnection; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("x") public class class10 { - @ObfuscatedName("l") - HttpsURLConnection field49; - @ObfuscatedName("q") - final Map field51; - @ObfuscatedName("f") + @ObfuscatedName("rz") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Low;" ) - class360 field50; - @ObfuscatedName("j") - Map field55; - @ObfuscatedName("m") + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("i") + HttpsURLConnection field46; + @ObfuscatedName("w") + final Map field40; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Li;" + descriptor = "Lmg;" ) - final class9 field52; - @ObfuscatedName("k") - boolean field53; - @ObfuscatedName("t") - boolean field54; + class360 field41; @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 978288269 + Map field42; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lb;" ) - int field57; + final class9 field43; + @ObfuscatedName("g") + boolean field44; + @ObfuscatedName("e") + boolean field45; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 592251103 + ) + int field47; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Li;)V" + descriptor = "(Ljava/net/URL;Lb;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field53 = false; - this.field54 = false; - this.field57 = 300000; - if (!var2.method74()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method85()); + this.field44 = false; // L: 20 + this.field45 = false; // L: 21 + this.field47 = 300000; // L: 22 + if (!var2.method76()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method78()); // L: 25 } else { - this.field49 = (HttpsURLConnection)var1.openConnection(); - this.field49.setSSLSocketFactory(new class15()); - this.field52 = var2; - this.field51 = new HashMap(); - this.field55 = new HashMap(); + this.field46 = (HttpsURLConnection)var1.openConnection(); // L: 26 + this.field46.setSSLSocketFactory(new class15()); // L: 27 + this.field43 = var2; // L: 28 + this.field40 = new HashMap(); // L: 29 + this.field42 = new HashMap(); // L: 30 } - } + } // L: 31 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1233460295" + garbageValue = "1308010097" ) - public void method91(String var1, String var2) { - if (!this.field53) { - this.field51.put(var1, var2); + public void method86(String var1, String var2) { + if (!this.field44) { // L: 34 + this.field40.put(var1, var2); // L: 35 } - } + } // L: 36 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-25817" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1722889443" ) - String method92() { - ArrayList var1 = new ArrayList(this.field55.entrySet()); - Collections.sort(var1, new class18(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); + String method87() { + ArrayList var1 = new ArrayList(this.field42.entrySet()); // L: 39 + Collections.sort(var1, new class18(this)); // L: 40 + StringBuilder var2 = new StringBuilder(); // L: 53 + Iterator var3 = var1.iterator(); // L: 54 while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { + Entry var4 = (Entry)var3.next(); // L: 55 + if (var2.length() > 0) { // L: 57 var2.append(","); } - var2.append(((class359)var4.getKey()).method6333()); - float var5 = (Float)var4.getValue(); - if (var5 < 1.0F) { - String var6 = Float.toString(var5).substring(0, 4); - var2.append(";q=" + var6); + var2.append(((class359)var4.getKey()).method6418()); // 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 } } - return var2.toString(); + return var2.toString(); // L: 66 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2133161377" + garbageValue = "-268892273" ) - void method102() throws ProtocolException { - if (!this.field53) { - this.field49.setRequestMethod(this.field52.method85()); - if (!this.field55.isEmpty()) { - this.field51.put("Accept", this.method92()); + void method88() throws ProtocolException { + if (!this.field44) { // L: 70 + this.field46.setRequestMethod(this.field43.method78()); // L: 71 + if (!this.field42.isEmpty()) { // L: 72 + this.field40.put("Accept", this.method87()); } - Iterator var1 = this.field51.entrySet().iterator(); + Iterator var1 = this.field40.entrySet().iterator(); // L: 73 while (var1.hasNext()) { - Entry var2 = (Entry)var1.next(); - this.field49.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); + Entry var2 = (Entry)var1.next(); // L: 74 + this.field46.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 } - if (this.field52.method76() && this.field50 != null) { - this.field49.setDoOutput(true); - ByteArrayOutputStream var13 = new ByteArrayOutputStream(); + if (this.field43.method70() && this.field41 != null) { // L: 79 + this.field46.setDoOutput(true); // L: 80 + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 try { - var13.write(this.field50.method6336((byte)89)); - var13.writeTo(this.field49.getOutputStream()); - } catch (IOException var11) { - var11.printStackTrace(); + var13.write(this.field41.method6423(1606591795)); // L: 83 + var13.writeTo(this.field46.getOutputStream()); // L: 84 + } catch (IOException var11) { // L: 86 + var11.printStackTrace(); // L: 87 } finally { - if (var13 != null) { + if (var13 != null) { // L: 90 try { - var13.close(); - } catch (IOException var10) { - var10.printStackTrace(); + var13.close(); // L: 92 + } catch (IOException var10) { // L: 94 + var10.printStackTrace(); // L: 95 } } } } - this.field49.setConnectTimeout(this.field57); - this.field49.setInstanceFollowRedirects(this.field54); - this.field53 = true; + this.field46.setConnectTimeout(this.field47); // L: 100 + this.field46.setInstanceFollowRedirects(this.field45); // L: 101 + this.field44 = true; // L: 102 } - } + } // L: 103 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1708578826" + garbageValue = "315003479" ) - boolean method94() throws IOException, SocketTimeoutException { - if (!this.field53) { - this.method102(); + boolean method89() throws IOException, SocketTimeoutException { + if (!this.field44) { // L: 106 + this.method88(); } - this.field49.connect(); - return this.field49.getResponseCode() == -1; + this.field46.connect(); // L: 107 + return this.field46.getResponseCode() == -1; // L: 108 } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)Lo;", - garbageValue = "-3416" + descriptor = "(I)Lm;", + garbageValue = "-347704447" ) - class21 method98() { + class21 method100() { try { - if (!this.field53 || this.field49.getResponseCode() == -1) { + if (!this.field44 || this.field46.getResponseCode() == -1) { // L: 114 return new class21("No REST response has been received yet."); } - } catch (IOException var10) { - this.field49.disconnect(); - return new class21("Error decoding REST response code: " + var10.getMessage()); + } catch (IOException var10) { // L: 116 + this.field46.disconnect(); // L: 117 + return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118 } - class21 var1 = null; + class21 var1 = null; // L: 120 class21 var3; try { - var1 = new class21(this.field49); - return var1; - } catch (IOException var8) { - var3 = new class21("Error decoding REST response: " + var8.getMessage()); + var1 = new class21(this.field46); // L: 122 + return var1; // L: 130 + } catch (IOException var8) { // L: 124 + var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125 } finally { - this.field49.disconnect(); + this.field46.disconnect(); } - return var3; + return var3; // L: 128 } - @ObfuscatedName("hc") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "516116106" + descriptor = "(B)V", + garbageValue = "0" ) - static void method104(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, WorldMapSectionType.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class67.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.method6930(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6931(var3[var6]); - var8.packetBuffer.method7066(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7066(0); - var8.packetBuffer.method6930(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7117(0); - var8.packetBuffer.method7029(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; - } - } - - if (!var4) { - GraphicsDefaults.addGameMessage(4, "", "Unable to find " + var1); - } - - } + static void method104() { + Login.worldSelectOpen = false; // L: 1614 + RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1615 + class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1616 + class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 1617 + } // L: 1618 } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 02fbbb31fb..1928c84553 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -11,664 +11,71 @@ import org.bouncycastle.crypto.tls.CertificateRequest; import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("w") +@ObfuscatedName("y") class class11 implements TlsAuthentication { - @ObfuscatedName("rt") + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lkd;" ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("i") - @Export("Tiles_hue") - static int[] Tiles_hue; + @Export("archive5") + static Archive archive5; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lv;" + descriptor = "Lt;" ) final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lv;)V" + descriptor = "(Lt;)V" ) class11(class13 var1) { - this.this$2 = var1; + this.this$2 = var1; // L: 248 + } + + public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { + return null; // L: 270 } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); - LinkedList var3 = new LinkedList(); - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 251 + LinkedList var3 = new LinkedList(); // L: 252 + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 254 - for (int var5 = 0; var5 < var4.length; ++var5) { - org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; - var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 255 + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 256 + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 258 } - this.this$2.this$1.field65 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); - } catch (CertificateException var7) { - throw new IOException(var7); + this.this$2.this$1.field53 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 262 + } catch (CertificateException var7) { // L: 264 + throw new IOException(var7); // L: 265 } - } - - public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; - } + } // L: 267 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-480736632" + descriptor = "(IZIZI)V", + garbageValue = "-1739783749" ) - public static void method105() { - StructComposition.StructDefinition_cached.clear(); - } - - @ObfuscatedName("en") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1585776634" - ) - @Export("load") - static void load() { - int var25; - if (Client.titleLoadingStage == 0) { - PlayerComposition.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var25 = 0; var25 < 4; ++var25) { - Client.collisionMaps[var25] = new CollisionMap(104, 104); - } - - 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) { - ClanChannel.archive0 = ItemLayer.newArchive(0, false, true, true); - MouseRecorder.archive1 = ItemLayer.newArchive(1, false, true, true); - RouteStrategy.archive2 = ItemLayer.newArchive(2, true, false, true); - class150.archive3 = ItemLayer.newArchive(3, false, true, true); - class260.archive4 = ItemLayer.newArchive(4, false, true, true); - ApproximateRouteStrategy.archive5 = ItemLayer.newArchive(5, true, true, true); - Tiles.archive6 = ItemLayer.newArchive(6, true, true, true); - Skeleton.archive7 = ItemLayer.newArchive(7, false, true, true); - class176.archive8 = ItemLayer.newArchive(8, false, true, true); - Interpreter.archive9 = ItemLayer.newArchive(9, false, true, true); - UserComparator8.archive10 = ItemLayer.newArchive(10, false, true, true); - class4.archive11 = ItemLayer.newArchive(11, false, true, true); - UserComparator6.archive12 = ItemLayer.newArchive(12, false, true, true); - class54.archive13 = ItemLayer.newArchive(13, true, false, true); - class28.archive14 = ItemLayer.newArchive(14, false, true, true); - class12.archive15 = ItemLayer.newArchive(15, false, true, true); - ItemContainer.archive17 = ItemLayer.newArchive(17, true, true, true); - TextureProvider.archive18 = ItemLayer.newArchive(18, false, true, true); - ViewportMouse.archive19 = ItemLayer.newArchive(19, false, true, true); - class54.archive20 = ItemLayer.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 var43 = 0; - var25 = var43 + ClanChannel.archive0.percentage() * 4 / 100; - var25 += MouseRecorder.archive1.percentage() * 4 / 100; - var25 += RouteStrategy.archive2.percentage() * 2 / 100; - var25 += class150.archive3.percentage() * 2 / 100; - var25 += class260.archive4.percentage() * 6 / 100; - var25 += ApproximateRouteStrategy.archive5.percentage() * 4 / 100; - var25 += Tiles.archive6.percentage() * 2 / 100; - var25 += Skeleton.archive7.percentage() * 56 / 100; - var25 += class176.archive8.percentage() * 2 / 100; - var25 += Interpreter.archive9.percentage() * 2 / 100; - var25 += UserComparator8.archive10.percentage() * 2 / 100; - var25 += class4.archive11.percentage() * 2 / 100; - var25 += UserComparator6.archive12.percentage() * 2 / 100; - var25 += class54.archive13.percentage() * 2 / 100; - var25 += class28.archive14.percentage() * 2 / 100; - var25 += class12.archive15.percentage() * 2 / 100; - var25 += ViewportMouse.archive19.percentage() / 100; - var25 += TextureProvider.archive18.percentage() / 100; - var25 += class54.archive20.percentage() / 100; - var25 += ItemContainer.archive17.method5201() && ItemContainer.archive17.isFullyLoaded() ? 1 : 0; - if (var25 != 100) { - if (var25 != 0) { - Login.Login_loadingText = "Checking for updates - " + var25 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - class13.method167(ClanChannel.archive0, "Animations"); - class13.method167(MouseRecorder.archive1, "Skeletons"); - class13.method167(class260.archive4, "Sound FX"); - class13.method167(ApproximateRouteStrategy.archive5, "Maps"); - class13.method167(Tiles.archive6, "Music Tracks"); - class13.method167(Skeleton.archive7, "Models"); - class13.method167(class176.archive8, "Sprites"); - class13.method167(class4.archive11, "Music Jingles"); - class13.method167(class28.archive14, "Music Samples"); - class13.method167(class12.archive15, "Music Patches"); - class13.method167(ViewportMouse.archive19, "World Map"); - class13.method167(TextureProvider.archive18, "World Map Geography"); - class13.method167(class54.archive20, "World Map Ground"); - class131.spriteIds = new GraphicsDefaults(); - class131.spriteIds.decode(ItemContainer.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } else if (Client.titleLoadingStage == 45) { - boolean var42 = !Client.isLowDetail; - PcmPlayer.field279 = 22050; - PcmPlayer.PcmPlayer_stereo = var42; - PcmPlayer.field283 = 2; - MidiPcmStream var38 = new MidiPcmStream(); - var38.method4736(9, 128); - class126.pcmPlayer0 = HitSplatDefinition.method3194(GameEngine.taskHandler, 0, 22050); - class126.pcmPlayer0.setStream(var38); - class264.method5077(class12.archive15, class28.archive14, class260.archive4, var38); - class116.pcmPlayer1 = HitSplatDefinition.method3194(GameEngine.taskHandler, 1, 2048); - ApproximateRouteStrategy.pcmStreamMixer = new PcmStreamMixer(); - class116.pcmPlayer1.setStream(ApproximateRouteStrategy.pcmStreamMixer); - RouteStrategy.decimator = new Decimator(22050, PcmPlayer.field279); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - class196.WorldMapElement_fonts = new Fonts(class176.archive8, class54.archive13); - } else { - int var26; - if (Client.titleLoadingStage == 50) { - FontName[] var35 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana11}; - var26 = var35.length; - Fonts var36 = class196.WorldMapElement_fonts; - FontName[] var41 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana11}; - Client.fontsMap = var36.createMap(var41); - if (Client.fontsMap.size() < var26) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var26 + "%"; - Login.Login_loadingPercent = 40; - } else { - UserComparator8.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - class262.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - Interpreter.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - MenuAction.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else if (Client.titleLoadingStage == 60) { - var25 = MouseHandler.method614(UserComparator8.archive10, class176.archive8); - var26 = Login.field907.length + Login.field890.length; - if (var25 < var26) { - Login.Login_loadingText = "Loading title screen - " + var25 * 100 / var26 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - UserList.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else { - Archive var2; - if (Client.titleLoadingStage == 70) { - if (!RouteStrategy.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + RouteStrategy.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var34 = RouteStrategy.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var34; - GrandExchangeOfferTotalQuantityComparator.method5361(RouteStrategy.archive2); - Archive var37 = RouteStrategy.archive2; - var2 = Skeleton.archive7; - KitDefinition.KitDefinition_archive = var37; - KitDefinition.KitDefinition_modelsArchive = var2; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - class114.method2490(RouteStrategy.archive2, Skeleton.archive7, Client.isLowDetail); - class128.method2662(RouteStrategy.archive2, Skeleton.archive7); - class157.method2982(RouteStrategy.archive2); - Archive var29 = RouteStrategy.archive2; - Archive var4 = Skeleton.archive7; - boolean var30 = Client.isMembersWorld; - Font var31 = UserComparator8.fontPlain11; - UserComparator4.ItemDefinition_archive = var29; - ItemComposition.ItemDefinition_modelArchive = var4; - ItemComposition.ItemDefinition_inMembersWorld = var30; - class17.ItemDefinition_fileCount = UserComparator4.ItemDefinition_archive.getGroupFileCount(10); - ItemComposition.ItemDefinition_fontPlain11 = var31; - Archive var39 = RouteStrategy.archive2; - Archive var32 = ClanChannel.archive0; - Archive var40 = MouseRecorder.archive1; - class395.SequenceDefinition_archive = var39; - class13.SequenceDefinition_animationsArchive = var32; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var40; - HealthBarDefinition.method2978(RouteStrategy.archive2, Skeleton.archive7); - Archive var33 = RouteStrategy.archive2; - VarbitComposition.VarbitDefinition_archive = var33; - Archive var11 = RouteStrategy.archive2; - class351.VarpDefinition_archive = var11; - VarpDefinition.VarpDefinition_fileCount = class351.VarpDefinition_archive.getGroupFileCount(16); - Archive var12 = class150.archive3; - Archive var13 = Skeleton.archive7; - Archive var14 = class176.archive8; - Archive var15 = class54.archive13; - Widget.Widget_archive = var12; - Widget.Widget_modelsArchive = var13; - IntHashTable.Widget_spritesArchive = var14; - SecureRandomFuture.Widget_fontsArchive = var15; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - class157.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - Language.method5481(RouteStrategy.archive2); - FriendsList.method5954(RouteStrategy.archive2); - Archive var16 = RouteStrategy.archive2; - VarcInt.VarcInt_archive = var16; - Archive var17 = RouteStrategy.archive2; - DevicePcmPlayerProvider.ParamDefinition_archive = var17; - TriBool.field3979 = new class387(class392.field4267, 54, ReflectionCheck.clientLanguage, RouteStrategy.archive2); - WorldMapIcon_1.HitSplatDefinition_cachedSprites = new class387(class392.field4267, 47, ReflectionCheck.clientLanguage, RouteStrategy.archive2); - Tile.varcs = new Varcs(); - Archive var18 = RouteStrategy.archive2; - Archive var19 = class176.archive8; - Archive var20 = class54.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var18; - HitSplatDefinition.field1799 = var19; - class17.HitSplatDefinition_fontsArchive = var20; - AttackOption.method2262(RouteStrategy.archive2, class176.archive8); - Archive var21 = RouteStrategy.archive2; - Archive var22 = class176.archive8; - WorldMapElement.WorldMapElement_archive = var22; - if (var21.isFullyLoaded()) { - WorldMapElement.WorldMapElement_count = var21.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; - - for (int var23 = 0; var23 < WorldMapElement.WorldMapElement_count; ++var23) { - byte[] var24 = var21.takeFile(35, var23); - WorldMapElement.WorldMapElement_cached[var23] = new WorldMapElement(var23); - if (var24 != null) { - WorldMapElement.WorldMapElement_cached[var23].decode(new Buffer(var24)); - WorldMapElement.WorldMapElement_cached[var23].method2900(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var25 = 0; - if (class4.compass == null) { - class4.compass = AccessFile.SpriteBuffer_getSprite(class176.archive8, class131.spriteIds.compass, 0); - } else { - ++var25; - } - - if (class21.redHintArrowSprite == null) { - class21.redHintArrowSprite = AccessFile.SpriteBuffer_getSprite(class176.archive8, class131.spriteIds.field4014, 0); - } else { - ++var25; - } - - if (GrandExchangeOfferTotalQuantityComparator.mapSceneSprites == null) { - GrandExchangeOfferTotalQuantityComparator.mapSceneSprites = KitDefinition.method2934(class176.archive8, class131.spriteIds.mapScenes, 0); - } else { - ++var25; - } - - SpritePixels[] var1; - int var3; - SpritePixels[] var5; - int var6; - SpritePixels var7; - int var8; - byte[] var9; - int var10; - if (class21.headIconPkSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.headIconsPk; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subHeight * var7.subWidth; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - class21.headIconPkSprites = var1; - } else { - ++var25; - } - - if (HealthBarUpdate.headIconPrayerSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.field4017; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subHeight * var7.subWidth; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - HealthBarUpdate.headIconPrayerSprites = var1; - } else { - ++var25; - } - - if (UserComparator4.headIconHintSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.field4015; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subWidth * var7.subHeight; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - UserComparator4.headIconHintSprites = var1; - } else { - ++var25; - } - - if (Client.mapMarkerSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.field4018; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subWidth * var7.subHeight; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - Client.mapMarkerSprites = var1; - } else { - ++var25; - } - - if (SecureRandomFuture.crossSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.field4020; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subHeight * var7.subWidth; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - SecureRandomFuture.crossSprites = var1; - } else { - ++var25; - } - - if (class119.mapDotSprites == null) { - var2 = class176.archive8; - var3 = class131.spriteIds.field4019; - if (!VarbitComposition.method3102(var2, var3, 0)) { - var1 = null; - } else { - var5 = new SpritePixels[class414.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class414.SpriteBuffer_spriteCount) { - StudioGame.method5130(); - var1 = var5; - break; - } - - var7 = var5[var6] = new SpritePixels(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class131.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[var6]; - var8 = var7.subWidth * var7.subHeight; - var9 = class414.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class351.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - class119.mapDotSprites = var1; - } else { - ++var25; - } - - if (WorldMapDecoration.scrollBarSprites == null) { - WorldMapDecoration.scrollBarSprites = KitDefinition.method2934(class176.archive8, class131.spriteIds.field4022, 0); - } else { - ++var25; - } - - if (ApproximateRouteStrategy.modIconSprites == null) { - ApproximateRouteStrategy.modIconSprites = KitDefinition.method2934(class176.archive8, class131.spriteIds.field4013, 0); - } else { - ++var25; - } - - if (var25 < 11) { - Login.Login_loadingText = "Loading sprites - " + var25 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = ApproximateRouteStrategy.modIconSprites; - class21.redHintArrowSprite.normalize(); - var26 = (int)(Math.random() * 21.0D) - 10; - int var27 = (int)(Math.random() * 21.0D) - 10; - var3 = (int)(Math.random() * 21.0D) - 10; - int var28 = (int)(Math.random() * 41.0D) - 20; - GrandExchangeOfferTotalQuantityComparator.mapSceneSprites[0].shiftColors(var28 + var26, var27 + var28, var28 + var3); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!Interpreter.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - Language.textureProvider = new TextureProvider(Interpreter.archive9, class176.archive8, 20, WorldMapDecorationType.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(Language.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(WorldMapDecorationType.clientPreferences.brightness); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var25 = Language.textureProvider.getLoadedPercentage(); - if (var25 < 100) { - Login.Login_loadingText = "Loading textures - " + var25 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - ClientPreferences.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(ClientPreferences.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!UserComparator8.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var0 = new Huffman(UserComparator8.archive10.takeFileByNames("huffman", "")); - class264.huffman = var0; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!class150.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class150.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!UserComparator6.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + UserComparator6.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!class54.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + class54.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - Client.titleLoadingStage = 140; - } - } else if (Client.titleLoadingStage == 140) { - Login.Login_loadingPercent = 100; - if (!ViewportMouse.archive19.tryLoadGroupByName(WorldMapCacheName.field2220.name)) { - Login.Login_loadingText = "Loading world map - " + ViewportMouse.archive19.groupLoadPercentByName(WorldMapCacheName.field2220.name) / 10 + "%"; - } else { - if (TileItem.worldMap == null) { - TileItem.worldMap = new WorldMap(); - TileItem.worldMap.init(ViewportMouse.archive19, TextureProvider.archive18, class54.archive20, Interpreter.fontBold12, Client.fontsMap, GrandExchangeOfferTotalQuantityComparator.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - UserList.updateGameState(10); - } - } + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (WorldMapEvent.World_worlds != null) { // L: 171 + FriendSystem.doWorldSorting(0, WorldMapEvent.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 } - } - @ObfuscatedName("gp") + } // L: 174 + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "836711710" + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-233699552" ) - static final void method110(int var0, int var1, int var2, int var3) { - class115.method2501(); - } + static final void method107(String var0, int var1) { + PacketBufferNode var2 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2746, Client.packetWriter.isaacCipher); // L: 242 + var2.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 243 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 244 + var2.packetBuffer.writeByte(var1); // L: 245 + Client.packetWriter.addNode(var2); // L: 246 + } // L: 247 } diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java index 40f7a8e47a..1b7d74c9ff 100644 --- a/runescape-client/src/main/java/class110.java +++ b/runescape-client/src/main/java/class110.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dc") +@ObfuscatedName("dh") public interface class110 { } diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java index 84d956997c..4b9ae38c49 100644 --- a/runescape-client/src/main/java/class111.java +++ b/runescape-client/src/main/java/class111.java @@ -1,26 +1,193 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("du") public class class111 implements class110 { - @ObfuscatedName("kp") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "27" + descriptor = "Lkd;" ) - static final void method2467(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2729()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketWriter var4 = Client.packetWriter; - PacketBufferNode var5 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2696, var4.isaacCipher); - var5.packetBuffer.writeByte(4 + class113.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); + @Export("archive19") + static Archive archive19; + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Lms;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-721238808" + ) + public static final synchronized long method2516() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class397.field4289) { // L: 15 + class397.field4288 += class397.field4289 - var0; // L: 16 + } + + class397.field4289 = var0; // L: 18 + return var0 + class397.field4288; // L: 19 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1420142897" + ) + public static boolean method2514(int var0) { + return (var0 >> 31 & 1) != 0; // L: 37 + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-600085887" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = GameBuild.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5896 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { // L: 5897 + var7 = GameBuild.scene.getObjectFlags(var0, var1, var2, var5); // L: 5898 + var8 = var7 >> 6 & 3; // L: 5899 + var9 = var7 & 31; // L: 5900 + var10 = var3; // L: 5901 + if (ItemLayer.method4106(var5)) { // L: 5902 + var10 = var4; + } + + int[] var11 = class10.sceneMinimapSprite.pixels; // L: 5903 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5904 + var13 = class21.Entity_unpackID(var5); // L: 5905 + ObjectComposition var14 = KitDefinition.getObjectDefinition(var13); // L: 5906 + if (var14.mapSceneId != -1) { // L: 5907 + IndexedSprite var15 = TriBool.mapSceneSprites[var14.mapSceneId]; // L: 5908 + if (var15 != null) { // L: 5909 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5910 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5911 + var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5912 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5916 + if (var8 == 0) { // L: 5917 + var11[var12] = var10; // L: 5918 + var11[var12 + 512] = var10; // L: 5919 + var11[var12 + 1024] = var10; // L: 5920 + var11[var12 + 1536] = var10; // L: 5921 + } else if (var8 == 1) { // L: 5923 + var11[var12] = var10; // L: 5924 + var11[var12 + 1] = var10; // L: 5925 + var11[var12 + 2] = var10; // L: 5926 + var11[var12 + 3] = var10; // L: 5927 + } else if (var8 == 2) { // L: 5929 + var11[var12 + 3] = var10; // L: 5930 + var11[var12 + 512 + 3] = var10; // L: 5931 + var11[var12 + 1024 + 3] = var10; // L: 5932 + var11[var12 + 1536 + 3] = var10; // L: 5933 + } else if (var8 == 3) { // L: 5935 + var11[var12 + 1536] = var10; // L: 5936 + var11[var12 + 1536 + 1] = var10; // L: 5937 + var11[var12 + 1536 + 2] = var10; // L: 5938 + var11[var12 + 1536 + 3] = var10; // L: 5939 + } + } + + if (var9 == 3) { // L: 5942 + if (var8 == 0) { // L: 5943 + var11[var12] = var10; + } else if (var8 == 1) { // L: 5944 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 5945 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5946 + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5948 + if (var8 == 3) { // L: 5949 + var11[var12] = var10; // L: 5950 + var11[var12 + 512] = var10; // L: 5951 + var11[var12 + 1024] = var10; // L: 5952 + var11[var12 + 1536] = var10; // L: 5953 + } else if (var8 == 0) { // L: 5955 + var11[var12] = var10; // L: 5956 + var11[var12 + 1] = var10; // L: 5957 + var11[var12 + 2] = var10; // L: 5958 + var11[var12 + 3] = var10; // L: 5959 + } else if (var8 == 1) { // L: 5961 + var11[var12 + 3] = var10; // L: 5962 + var11[var12 + 512 + 3] = var10; // L: 5963 + var11[var12 + 1024 + 3] = var10; // L: 5964 + var11[var12 + 1536 + 3] = var10; // L: 5965 + } else if (var8 == 2) { // L: 5967 + var11[var12 + 1536] = var10; // L: 5968 + var11[var12 + 1536 + 1] = var10; // L: 5969 + var11[var12 + 1536 + 2] = var10; // L: 5970 + var11[var12 + 1536 + 3] = var10; // L: 5971 + } + } } } - } + + var5 = GameBuild.scene.getGameObjectTag(var0, var1, var2); // L: 5976 + if (var5 != 0L) { // L: 5977 + var7 = GameBuild.scene.getObjectFlags(var0, var1, var2, var5); // L: 5978 + var8 = var7 >> 6 & 3; // L: 5979 + var9 = var7 & 31; // L: 5980 + var10 = class21.Entity_unpackID(var5); // L: 5981 + ObjectComposition var24 = KitDefinition.getObjectDefinition(var10); // L: 5982 + int var19; + if (var24.mapSceneId != -1) { // L: 5983 + IndexedSprite var20 = TriBool.mapSceneSprites[var24.mapSceneId]; // L: 5984 + if (var20 != null) { // L: 5985 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5986 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5987 + var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5988 + } + } else if (var9 == 9) { // L: 5991 + var12 = 15658734; // L: 5992 + if (ItemLayer.method4106(var5)) { // L: 5993 + var12 = 15597568; + } + + int[] var18 = class10.sceneMinimapSprite.pixels; // L: 5994 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5995 + if (var8 != 0 && var8 != 2) { // L: 5996 + var18[var19] = var12; // L: 6003 + var18[var19 + 1 + 512] = var12; // L: 6004 + var18[var19 + 1024 + 2] = var12; // L: 6005 + var18[var19 + 1536 + 3] = var12; // L: 6006 + } else { + var18[var19 + 1536] = var12; // L: 5997 + var18[var19 + 1 + 1024] = var12; // L: 5998 + var18[var19 + 512 + 2] = var12; // L: 5999 + var18[var19 + 3] = var12; // L: 6000 + } + } + } + + var5 = GameBuild.scene.getFloorDecorationTag(var0, var1, var2); // L: 6010 + if (var5 != 0L) { // L: 6011 + var7 = class21.Entity_unpackID(var5); // L: 6012 + ObjectComposition var21 = KitDefinition.getObjectDefinition(var7); // L: 6013 + if (var21.mapSceneId != -1) { // L: 6014 + IndexedSprite var22 = TriBool.mapSceneSprites[var21.mapSceneId]; // L: 6015 + if (var22 != null) { // L: 6016 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6017 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6018 + var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6019 + } + } + } + + } // L: 6023 } diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java index a231371829..92fc8d3d43 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -1,104 +1,113 @@ +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("db") public enum class112 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldb;" ) - field1363(0, 0), - @ObfuscatedName("q") + field1350(1, 0), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldb;" ) - field1358(2, 1), - @ObfuscatedName("f") + field1345(0, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldb;" ) - field1359(3, 2), - @ObfuscatedName("j") + field1346(2, 2), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldb;" ) - field1362(1, 3); + field1347(3, 3); - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1343295737 + @ObfuscatedName("tc") + @ObfuscatedSignature( + descriptor = "Lbm;" ) - public final int field1361; - @ObfuscatedName("k") + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -7588353 + intValue = 125998715 + ) + public final int field1344; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -2047672005 ) @Export("id") final int id; class112(int var3, int var4) { - this.field1361 = var3; - this.id = var4; - } + this.field1344 = var3; // L: 16 + this.id = var4; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("i") + static double method2517(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 + } + + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)Lfg;", - garbageValue = "2143323219" + descriptor = "(Lew;III)Lak;", + garbageValue = "430440132" ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public static final PcmPlayer method2522(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { // L: 46 + if (var2 < 256) { // L: 47 + var2 = 256; + } + + try { + PcmPlayer var3 = ItemContainer.pcmPlayerProvider.player(); // L: 49 + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 50 + var3.field264 = var2; // L: 51 + var3.init(); // L: 52 + var3.capacity = (var2 & -1024) + 1024; // L: 53 + if (var3.capacity > 16384) { // L: 54 + var3.capacity = 16384; + } + + var3.open(var3.capacity); // L: 55 + if (PcmPlayer.field272 > 0 && class122.soundSystem == null) { // L: 56 + class122.soundSystem = new SoundSystem(); // L: 57 + class381.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58 + class381.soundSystemExecutor.scheduleAtFixedRate(class122.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59 + } + + if (class122.soundSystem != null) { // L: 61 + if (class122.soundSystem.players[var1] != null) { // L: 62 + throw new IllegalArgumentException(); + } + + class122.soundSystem.players[var1] = var3; // L: 63 + } + + return var3; // L: 65 + } catch (Throwable var4) { // L: 67 + return new PcmPlayer(); // L: 68 + } } else { - byte[] var2 = GrandExchangeOfferAgeComparator.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; + throw new IllegalArgumentException(); } } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "200795103" - ) - static void method2474(int var0) { - if (var0 != Login.loginIndex) { - Login.loginIndex = var0; - } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1793606804" - ) - static final void method2468(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field701[var4] = true; - } - } - - } } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index 68f060b791..a0dea954a7 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -1,42 +1,34 @@ -import net.runelite.mapping.Export; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("df") +@ObfuscatedName("dp") public class class113 extends class116 { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("fh") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 611077485 + intValue = 1422168885 ) - static int field1364; - @ObfuscatedName("l") + int field1356; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1446418621 + intValue = -1587001219 ) - int field1365; - @ObfuscatedName("q") + int field1353; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 837732111 + intValue = -1005373589 ) - int field1366; - @ObfuscatedName("f") + int field1354; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 191831599 + intValue = 191673925 ) - int field1367; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -779185285 - ) - int field1368; + int field1355; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -48,248 +40,333 @@ public class class113 extends class116 { ) class113(class119 var1) { this.this$0 = var1; - this.field1365 = -1; + this.field1356 = -1; + } // L: 163 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" + ) + void vmethod2847(Buffer var1) { + this.field1356 = var1.readUnsignedShort(); + this.field1353 = var1.readInt(); + this.field1354 = var1.readUnsignedByte(); + this.field1355 = var1.readUnsignedByte(); } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2767(Buffer var1) { - this.field1365 = var1.readUnsignedShort(); - this.field1366 = var1.readInt(); - this.field1367 = var1.readUnsignedByte(); - this.field1368 = var1.readUnsignedByte(); - } + void vmethod2848(ClanSettings var1) { + var1.method2663(this.field1356, this.field1353, this.field1354, this.field1355); // L: 173 + } // L: 174 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(I)V", + garbageValue = "1973528524" ) - void vmethod2766(ClanSettings var1) { - var1.method2596(this.field1365, this.field1366, this.field1367, this.field1368); - } + static void method2533() { + Tiles.Tiles_underlays = null; // L: 48 + Tiles.Tiles_overlays = null; // L: 49 + Tiles.Tiles_shapes = null; // L: 50 + Tiles.field969 = null; // L: 51 + Tiles.field962 = null; // L: 52 + class54.field419 = null; // L: 53 + DirectByteArrayCopier.field3212 = null; // L: 54 + TileItem.Tiles_hue = null; // L: 55 + class397.Tiles_saturation = null; // L: 56 + Tiles.Tiles_lightness = null; // L: 57 + class1.Tiles_hueMultiplier = null; // L: 58 + MouseRecorder.field1039 = null; // L: 59 + } // L: 60 - @ObfuscatedName("t") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "-47" + descriptor = "(Lko;Lko;ZII)V", + garbageValue = "-1234515035" ) - static int method2482(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); + static void method2529(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 148 + if (var3 == 4) { // L: 149 + class275.method5201(4); // L: 150 + } + } else { - var3 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - class16.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[--AbstractByteArrayCopier.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = class67.localPlayer.appearance.getChatHeadId(); - return 1; + if (var3 == 0) { // L: 154 + EnumComposition.method3097(var2); // L: 155 } else { - return 2; + class275.method5201(var3); // L: 158 + } + + Rasterizer2D.Rasterizer2D_clear(); // L: 160 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 161 + BufferedImage var6 = null; // L: 164 + + SpritePixels var5; + int var8; + label66: { + try { + var6 = ImageIO.read(new ByteArrayInputStream(var4)); // L: 166 + int var7 = var6.getWidth(); // L: 167 + var8 = var6.getHeight(); // L: 168 + int[] var9 = new int[var8 * var7]; // L: 169 + PixelGrabber var10 = new PixelGrabber(var6, 0, 0, var7, var8, var9, 0, var7); // L: 170 + var10.grabPixels(); // L: 171 + var5 = new SpritePixels(var9, var7, var8); // L: 172 + break label66; + } catch (IOException var17) { // L: 175 + } catch (InterruptedException var18) { // L: 176 + } + + var5 = new SpritePixels(0, 0); // L: 177 + } + + RouteStrategy.leftTitleSprite = var5; // L: 179 + class139.rightTitleSprite = RouteStrategy.leftTitleSprite.mirrorHorizontally(); // L: 180 + int var12 = Client.worldProperties; // L: 181 + if ((var12 & 536870912) != 0) { // L: 183 + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 184 + } else if ((var12 & 1073741824) != 0) { // L: 186 + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 187 + } else { + class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 190 + } + + Login.titleboxSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 193 + Login.titlebuttonSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 194 + Login.field854 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 195 + class29.field159 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 196 + Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 197 + Login.runesSprite = class393.method6882(var1, "runes", ""); // L: 198 + VarpDefinition.title_muteSprite = class393.method6882(var1, "title_mute", ""); // L: 199 + NetSocket.options_buttons_0Sprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 200 + Login.field868 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 201 + class9.options_buttons_2Sprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 202 + ClanMate.field3950 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 203 + class327.field3908 = NetSocket.options_buttons_0Sprite.subWidth; // L: 204 + UserComparator9.field1326 = NetSocket.options_buttons_0Sprite.subHeight; // L: 205 + Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 206 + if (var2) { // L: 207 + Login.Login_username = ""; // L: 208 + Login.Login_password = ""; // L: 209 + } + + ReflectionCheck.field429 = 0; // L: 211 + Tiles.otp = ""; // L: 212 + Login.field875 = true; // L: 213 + Login.worldSelectOpen = false; // L: 214 + if (!class408.clientPreferences.titleMusicDisabled) { // L: 215 + Archive var11 = Messages.archive6; // L: 216 + var8 = var11.getGroupId("scape main"); // L: 218 + int var13 = var11.getFileId(var8, ""); // L: 219 + class247.musicPlayerStatus = 1; // L: 221 + class128.musicTrackArchive = var11; // L: 222 + FillMode.musicTrackGroupId = var8; // L: 223 + ArchiveDiskActionHandler.musicTrackFileId = var13; // L: 224 + class247.musicTrackVolume = 255; // L: 225 + SecureRandomCallable.musicTrackBoolean = false; // L: 226 + class247.pcmSampleLength = 2; // L: 227 + } else { + class247.musicPlayerStatus = 1; // L: 232 + class128.musicTrackArchive = null; // L: 233 + FillMode.musicTrackGroupId = -1; // L: 234 + ArchiveDiskActionHandler.musicTrackFileId = -1; // L: 235 + class247.musicTrackVolume = 0; // L: 236 + SecureRandomCallable.musicTrackBoolean = false; // L: 237 + class247.pcmSampleLength = 2; // L: 238 + } + + if (NetCache.NetCache_socket != null) { // L: 241 + try { + Buffer var19 = new Buffer(4); // L: 243 + var19.writeByte(3); // L: 244 + var19.writeMedium(0); // L: 245 + NetCache.NetCache_socket.write(var19.array, 0, 4); // L: 246 + } catch (IOException var16) { + try { + NetCache.NetCache_socket.close(); // L: 250 + } catch (Exception var15) { // L: 252 + } + + ++NetCache.NetCache_ioExceptions; // L: 253 + NetCache.NetCache_socket = null; // L: 254 + } + } + + Login.clearLoginScreen = true; // L: 257 + Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 258 + Login.loginBoxX = Login.xPadding + 202; // L: 259 + Login.loginBoxCenter = Login.loginBoxX + 180; // L: 260 + RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 261 + class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 262 + class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 263 + } + } // L: 152 264 + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(Ljf;II)I", + garbageValue = "-1898154429" + ) + static final int method2532(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10368 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10370 + int var3 = 0; // L: 10371 + int var4 = 0; // L: 10372 + byte var5 = 0; // L: 10373 + + while (true) { + int var6 = var2[var4++]; // L: 10375 + int var7 = 0; // L: 10376 + byte var8 = 0; // L: 10377 + if (var6 == 0) { // L: 10378 + return var3; + } + + if (var6 == 1) { // L: 10379 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10380 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10381 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10382 + var9 = var2[var4++] << 16; // L: 10383 + var9 += var2[var4++]; // L: 10384 + var10 = UserComparator9.getWidget(var9); // L: 10385 + var11 = var2[var4++]; // L: 10386 + if (var11 != -1 && (!TaskHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10387 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10388 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10389 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10393 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10394 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10395 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10396 + var7 = HealthBarDefinition.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10397 + for (var9 = 0; var9 < 25; ++var9) { // L: 10398 + if (Skills.Skills_enabled[var9]) { // L: 10399 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10402 + var9 = var2[var4++] << 16; // L: 10403 + var9 += var2[var4++]; // L: 10404 + var10 = UserComparator9.getWidget(var9); // L: 10405 + var11 = var2[var4++]; // L: 10406 + if (var11 != -1 && (!TaskHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10407 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10408 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10409 + var7 = 999999999; // L: 10410 + break; // L: 10411 + } + } + } + } + + if (var6 == 11) { // L: 10416 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10417 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10418 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10419 + int var13 = var2[var4++]; // L: 10420 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10421 + } + + if (var6 == 14) { // L: 10423 + var9 = var2[var4++]; // L: 10424 + var7 = class119.getVarbit(var9); // L: 10425 + } + + if (var6 == 15) { // L: 10427 + var8 = 1; + } + + if (var6 == 16) { // L: 10428 + var8 = 2; + } + + if (var6 == 17) { // L: 10429 + var8 = 3; + } + + if (var6 == 18) { // L: 10430 + var7 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; + } + + if (var6 == 19) { // L: 10431 + var7 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; + } + + if (var6 == 20) { // L: 10432 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10433 + if (var5 == 0) { // L: 10434 + var3 += var7; + } + + if (var5 == 1) { // L: 10435 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10436 + var3 /= var7; + } + + if (var5 == 3) { // L: 10437 + var3 *= var7; + } + + var5 = 0; // L: 10438 + } else { + var5 = var8; // L: 10440 + } + } + } catch (Exception var14) { // L: 10443 + return -1; // L: 10444 } } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = class87.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field3102 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field3102; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1268577977" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-1912016711" - ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { - var9 = var10; - break; - } - } - - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - Script.method1969(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field1104 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; - } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(Ljt;IIIB)V", - garbageValue = "1" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class356.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 = class67.localPlayer.x / 32 + 48; - int var7 = 464 - class67.localPlayer.y / 32; - class11.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) { - var16 = Client.mapIconXs[var8] * 4 + 2 - class67.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class67.localPlayer.y / 32; - StudioGame.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var16 = 0; var16 < 104; ++var16) { - NodeDeque var14 = Client.groundItems[VertexNormal.Client_plane][var8][var16]; - if (var14 != null) { - var11 = var8 * 4 + 2 - class67.localPlayer.x / 32; - var12 = var16 * 4 + 2 - class67.localPlayer.y / 32; - StudioGame.drawSpriteOnMinimap(var1, var2, var11, var12, class119.mapDotSprites[0], var4); - } - } - } - - 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) { - var11 = var9.x / 32 - class67.localPlayer.x / 32; - var12 = var9.y / 32 - class67.localPlayer.y / 32; - StudioGame.drawSpriteOnMinimap(var1, var2, var11, var12, class119.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var17 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var15 = Client.players[var17[var10]]; - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class67.localPlayer) { - var12 = var15.x / 32 - class67.localPlayer.x / 32; - int var13 = var15.y / 32 - class67.localPlayer.y / 32; - if (var15.isFriend()) { - StudioGame.drawSpriteOnMinimap(var1, var2, var12, var13, class119.mapDotSprites[3], var4); - } else if (class67.localPlayer.team != 0 && var15.team != 0 && var15.team == class67.localPlayer.team) { - StudioGame.drawSpriteOnMinimap(var1, var2, var12, var13, class119.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { - StudioGame.drawSpriteOnMinimap(var1, var2, var12, var13, class119.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { - StudioGame.drawSpriteOnMinimap(var1, var2, var12, var13, class119.mapDotSprites[6], var4); - } else { - StudioGame.drawSpriteOnMinimap(var1, var2, var12, var13, class119.mapDotSprites[2], var4); - } - } - } - - 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 - class67.localPlayer.x / 32; - var12 = var19.y / 32 - class67.localPlayer.y / 32; - Calendar.worldToMinimap(var1, var2, var11, var12, Client.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - WorldMapSectionType.baseX * 4 + 2 - class67.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - PlayerComposition.baseY * 4 + 2 - class67.localPlayer.y / 32; - Calendar.worldToMinimap(var1, var2, var10, var11, Client.mapMarkerSprites[1], var4); - } - - 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 - class67.localPlayer.x / 32; - var12 = var20.y / 32 - class67.localPlayer.y / 32; - Calendar.worldToMinimap(var1, var2, var11, var12, Client.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class67.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - class67.localPlayer.y / 32; - StudioGame.drawSpriteOnMinimap(var1, var2, var10, var11, Client.mapMarkerSprites[0], var4); - } - - if (!class67.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } - - Client.field701[var3] = true; + return -2; } } } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 60db8e7d86..045067099a 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -1,26 +1,35 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dj") public class class114 extends class116 { - @ObfuscatedName("qw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lmo;" ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("l") + static Bounds field1359; + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -7893519352844407853L + longValue = -3547917971433153133L ) - long field1371; - @ObfuscatedName("q") - String field1370; + long field1364; + @ObfuscatedName("w") + String field1360; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -32,344 +41,458 @@ public class class114 extends class116 { ) class114(class119 var1) { this.this$0 = var1; - this.field1371 = -1L; - this.field1370 = null; + this.field1364 = -1L; // L: 74 + this.field1360 = null; // L: 75 + } // L: 77 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" + ) + void vmethod2847(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 80 + --var1.offset; // L: 81 + this.field1364 = var1.readLong(); // L: 82 + } + + this.field1360 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + } // L: 85 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" + ) + void vmethod2848(ClanSettings var1) { + var1.method2655(this.field1364, this.field1360, 0); // L: 88 + } // L: 89 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([BI)Ljava/lang/String;", + garbageValue = "-216231156" + ) + public static String method2545(byte[] var0) { + return class135.method2795(var0, 0, var0.length); // L: 58 } - @ObfuscatedName("l") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(ILbp;ZB)I", + garbageValue = "64" ) - void vmethod2767(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1371 = var1.readLong(); - } - - this.field1370 = var1.readStringCp1252NullTerminatedOrNull(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" - ) - void vmethod2766(ClanSettings var1) { - var1.method2646(this.field1371, this.field1370, 0); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-769236648" - ) - public static void method2485(String var0, String var1, int var2, int var3) throws IOException { - Bounds.idxCount = var3; - UserComparator10.cacheGamebuild = var2; - - try { - Messages.operatingSystemName = System.getProperty("os.name"); - } catch (Exception var35) { - Messages.operatingSystemName = "Unknown"; - } - - class13.formattedOperatingSystemName = Messages.operatingSystemName.toLowerCase(); - - try { - class272.userHomeDirectory = System.getProperty("user.home"); - if (class272.userHomeDirectory != null) { - class272.userHomeDirectory = class272.userHomeDirectory + "/"; - } - } catch (Exception var34) { - } - - try { - if (class13.formattedOperatingSystemName.startsWith("win")) { - if (class272.userHomeDirectory == null) { - class272.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (class272.userHomeDirectory == null) { - class272.userHomeDirectory = System.getenv("HOME"); + static int method2542(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3317 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3318 + return 1; // L: 3319 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3321 + class14.Interpreter_intStackSize -= 3; // L: 3322 + Client.publicChatMode = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3323 + ApproximateRouteStrategy.privateChatMode = FloorDecoration.method4189(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 3324 + if (ApproximateRouteStrategy.privateChatMode == null) { // L: 3325 + ApproximateRouteStrategy.privateChatMode = PrivateChatMode.field4425; } - if (class272.userHomeDirectory != null) { - class272.userHomeDirectory = class272.userHomeDirectory + "/"; - } - } catch (Exception var33) { - } - - if (class272.userHomeDirectory == null) { - class272.userHomeDirectory = "~/"; - } - - class396.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class272.userHomeDirectory, "/tmp/", ""}; - class92.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator10.cacheGamebuild, ".file_store_" + UserComparator10.cacheGamebuild}; - int var18 = 0; - - File var5; - label308: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; - JagexCache.JagexCache_locationFile = new File(class272.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); - String var7 = null; - String var8 = null; - boolean var9 = false; - int var12; - int var14; - File var43; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - - Buffer var11; - for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { - var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); - if (var12 == -1) { - throw new IOException(); - } - } - - var11.offset = 0; - var12 = var11.readUnsignedByte(); - if (var12 < 1 || var12 > 3) { - throw new IOException("" + var12); - } - - int var13 = 0; - if (var12 > 1) { - var13 = var11.readUnsignedByte(); - } - - if (var12 <= 2) { - var7 = var11.readStringCp1252NullCircumfixed(); - if (var13 == 1) { - var8 = var11.readStringCp1252NullCircumfixed(); - } - } else { - var7 = var11.readCESU8(); - if (var13 == 1) { - var8 = var11.readCESU8(); - } - } - - var10.close(); - } catch (IOException var38) { - var38.printStackTrace(); - } - - if (var7 != null) { - var43 = new File(var7); - if (!var43.exists()) { - var7 = null; - } - } - - if (var7 != null) { - var43 = new File(var7, "test.dat"); - - boolean var46; - try { - RandomAccessFile var19 = new RandomAccessFile(var43, "rw"); - var14 = var19.read(); - var19.seek(0L); - var19.write(var14); - var19.seek(0L); - var19.close(); - var43.delete(); - var46 = true; - } catch (Exception var32) { - var46 = false; - } - - if (!var46) { - var7 = null; - } - } - } - - if (var7 == null && var18 == 0) { - label282: - for (int var20 = 0; var20 < class92.cacheSubPaths.length; ++var20) { - for (int var21 = 0; var21 < class396.cacheParentPaths.length; ++var21) { - File var22 = new File(class396.cacheParentPaths[var21] + class92.cacheSubPaths[var20] + File.separatorChar + var0 + File.separatorChar); - if (var22.exists()) { - File var23 = new File(var22, "test.dat"); - - boolean var47; - try { - RandomAccessFile var15 = new RandomAccessFile(var23, "rw"); - int var16 = var15.read(); - var15.seek(0L); - var15.write(var16); - var15.seek(0L); - var15.close(); - var23.delete(); - var47 = true; - } catch (Exception var31) { - var47 = false; - } - - if (var47) { - var7 = var22.toString(); - var9 = true; - break label282; - } - } - } - } - } - - if (var7 == null) { - var7 = class272.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var9 = true; - } - - if (var8 != null) { - File var42 = new File(var8); - var43 = new File(var7); - - try { - File[] var51 = var42.listFiles(); - File[] var49 = var51; - - for (var14 = 0; var14 < var49.length; ++var14) { - File var48 = var49[var14]; - File var24 = new File(var43, var48.getName()); - boolean var17 = var48.renameTo(var24); - if (!var17) { - throw new IOException(); - } - } - } catch (Exception var37) { - var37.printStackTrace(); - } - - var9 = true; - } - - if (var9) { - EnumComposition.method3007(new File(var7), (File)null); - } - - var5 = new File(var7); - JagexCache.cacheDir = var5; - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var39 = JagexCache.cacheDir.listFiles(); - if (var39 != null) { - File[] var44 = var39; - - for (int var25 = 0; var25 < var44.length; ++var25) { - File var26 = var44[var25]; - - boolean var50; - try { - RandomAccessFile var45 = new RandomAccessFile(var26, "rw"); - var12 = var45.read(); - var45.seek(0L); - var45.write(var12); - var45.seek(0L); - var45.close(); - var50 = true; - } catch (Exception var30) { - var50 = false; - } - - if (!var50) { - ++var18; - continue label308; - } - } - } - break; - } - - File var4 = JagexCache.cacheDir; - FileSystem.FileSystem_cacheDir = var4; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); + Client.tradeChatMode = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3326 + PacketBufferNode var13 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2696, Client.packetWriter.isaacCipher); // L: 3328 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3329 + var13.packetBuffer.writeByte(ApproximateRouteStrategy.privateChatMode.field4424); // L: 3330 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3331 + Client.packetWriter.addNode(var13); // L: 3332 + return 1; // L: 3333 } else { - FileSystem.FileSystem_hasPermissions = true; + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3335 + var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3336 + class14.Interpreter_intStackSize -= 2; // L: 3337 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3338 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3339 + var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 3341 + var6.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3342 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3343 + var6.packetBuffer.writeByte(var7 - 1); // L: 3344 + var6.packetBuffer.writeByte(var9); // L: 3345 + Client.packetWriter.addNode(var6); // L: 3346 + return 1; // L: 3347 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3349 + class14.Interpreter_intStackSize -= 2; // L: 3350 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3351 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3352 + var5 = class54.Messages_getByChannelAndID(var3, var7); // L: 3353 + if (var5 != null) { // L: 3354 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.count; // L: 3355 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.cycle; // L: 3356 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3357 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3358 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3359 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3360 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3363 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3364 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3365 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3366 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3367 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3368 + } - try { - var5 = new File(class272.userHomeDirectory, "random.dat"); - int var28; - if (var5.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); + return 1; // L: 3370 } else { - label231: - for (int var27 = 0; var27 < class92.cacheSubPaths.length; ++var27) { - for (var28 = 0; var28 < class396.cacheParentPaths.length; ++var28) { - File var41 = new File(class396.cacheParentPaths[var28] + class92.cacheSubPaths[var27] + File.separatorChar + "random.dat"); - if (var41.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var41, "rw", 25L), 24, 0); - break label231; + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3372 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3373 + var4 = class122.Messages_getMessage(var3); // L: 3374 + if (var4 != null) { // L: 3375 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.type; // L: 3376 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.cycle; // L: 3377 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3378 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3379 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3380 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3381 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3384 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3385 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3386 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3387 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3388 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3389 + } + + return 1; // L: 3391 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3393 + if (ApproximateRouteStrategy.privateChatMode == null) { // L: 3394 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.privateChatMode.field4424; // L: 3395 + } + + return 1; // L: 3396 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3398 + var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3399 + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3400 + var12 = class383.method6755(var7, var8, MouseHandler.clientLanguage, -1); // L: 3401 + Client.packetWriter.addNode(var12); // L: 3402 + return 1; // L: 3403 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3405 + class295.Interpreter_stringStackSize -= 2; // L: 3406 + var8 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3407 + String var11 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3408 + var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2675, Client.packetWriter.isaacCipher); // L: 3410 + var12.packetBuffer.writeShort(0); // L: 3411 + int var10 = var12.packetBuffer.offset; // L: 3412 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3413 + class132.method2769(var12.packetBuffer, var11); // L: 3414 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3415 + Client.packetWriter.addNode(var12); // L: 3416 + return 1; // L: 3417 + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3419 + var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3420 + class14.Interpreter_intStackSize -= 2; // L: 3421 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3422 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3423 + var6 = class383.method6755(var7, var8, MouseHandler.clientLanguage, var9); // L: 3424 + Client.packetWriter.addNode(var6); // L: 3425 + return 1; // L: 3426 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3428 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3435 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3436 + return 1; // L: 3437 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3439 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3440 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ObjectSound.Messages_getHistorySize(var3); // L: 3441 + return 1; // L: 3442 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3444 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3445 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ClanChannelMember.Messages_getLastChatID(var3); // L: 3446 + return 1; // L: 3447 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3449 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3450 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapData_0.method3530(var3); // L: 3451 + return 1; // L: 3452 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3454 + var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3455 + class7.doCheat(var8); // L: 3456 + return 1; // L: 3457 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3459 + Client.field692 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3460 + return 1; // L: 3461 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3463 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = Client.field692; // L: 3464 + return 1; // L: 3465 + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3467 + var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3468 + System.out.println(var8); // L: 3469 + return 1; // L: 3470 + } else if (var0 == 5024) { // L: 3472 + --class14.Interpreter_intStackSize; // L: 3473 + return 1; // L: 3474 + } else if (var0 == 5025) { // L: 3476 + ++class14.Interpreter_intStackSize; // L: 3477 + return 1; // L: 3478 + } else if (var0 == 5030) { // L: 3480 + class14.Interpreter_intStackSize -= 2; // L: 3481 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3482 + var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3483 + var5 = class54.Messages_getByChannelAndID(var3, var7); // L: 3484 + if (var5 != null) { // L: 3485 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.count; // L: 3486 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.cycle; // L: 3487 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3488 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3489 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3490 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3491 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3492 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3493 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3496 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3497 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3498 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3499 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3500 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3501 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3502 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3503 + } + + return 1; // L: 3505 + } else if (var0 == 5031) { // L: 3507 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3508 + var4 = class122.Messages_getMessage(var3); // L: 3509 + if (var4 != null) { // L: 3510 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.type; // L: 3511 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.cycle; // L: 3512 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3513 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3514 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3515 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3516 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3517 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3518 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3521 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3522 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3523 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3524 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3525 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3526 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3527 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3528 + } + + return 1; // L: 3530 + } else { + return 2; // L: 3532 } + } else { + if (HealthBarDefinition.localPlayer != null && HealthBarDefinition.localPlayer.username != null) { // L: 3430 + var8 = HealthBarDefinition.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3431 + } + + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8; // L: 3432 + return 1; // L: 3433 } } } + } + } + } - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var40 = new RandomAccessFile(var5, "rw"); - var28 = var40.read(); - var40.seek(0L); - var40.write(var28); - var40.seek(0L); - var40.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-929518083" + ) + static final void method2538() { + Client.field539 = 0; // L: 5600 + int var0 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 5601 + int var1 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 5602 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5603 + Client.field539 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5604 + Client.field539 = 1; + } + + if (Client.field539 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5605 + Client.field539 = 0; + } + + } // L: 5606 + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(Ljf;III)V", + garbageValue = "226743151" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10471 + EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10472 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10475 + var3 = class20.Widget_getSpellActionName(var0); // L: 10476 + if (var3 != null) { // L: 10477 + EnumComposition.insertMenuItemNoShift(var3, MouseHandler.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10478 + } + } + + if (var0.buttonType == 3) { // L: 10482 + EnumComposition.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10483 + } + + if (var0.buttonType == 4) { // L: 10486 + EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10487 + } + + if (var0.buttonType == 5) { // L: 10490 + EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10491 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10494 + EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10495 + } + + int var4; + int var13; + if (var0.type == 2) { // L: 10498 + var13 = 0; // L: 10499 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10500 + for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10501 + int var6 = (var0.paddingX + 32) * var15; // L: 10502 + int var7 = (var0.paddingY + 32) * var4; // L: 10503 + if (var13 < 20) { // L: 10504 + var6 += var0.inventoryXOffsets[var13]; // L: 10505 + var7 += var0.inventoryYOffsets[var13]; // L: 10506 + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10508 + Client.dragItemSlotDestination = var13; // L: 10509 + class274.hoveredItemContainer = var0; // L: 10510 + if (var0.itemIds[var13] > 0) { // L: 10511 + ItemComposition var8 = TaskHandler.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10512 + if (Client.isItemSelected == 1 && Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10513 + if (var0.id != MouseHandler.selectedItemWidget || var13 != ReflectionCheck.selectedItemSlot) { // L: 10514 + EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10515 + } + } else if (Client.isSpellSelected && Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10519 + if ((class116.selectedSpellFlags & 16) == 16) { // L: 10520 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10521 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10526 + int var10 = -1; // L: 10527 + if (Client.shiftClickDrop && UserComparator7.method2466()) { // L: 10528 + var10 = var8.getShiftClickIndex(); // L: 10529 + } + + int var11; + if (Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10531 + for (var11 = 4; var11 >= 3; --var11) { // L: 10532 + if (var11 != var10) { // L: 10533 + ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10534 + } + } + } + + if (class111.method2514(PendingSpawn.getWidgetFlags(var0))) { // L: 10537 + EnumComposition.insertMenuItemNoShift("Use", MouseHandler.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10538 + } + + if (Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10541 + for (var11 = 2; var11 >= 0; --var11) { // L: 10542 + if (var10 != var11) { // L: 10543 + ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10544 + } + } + + if (var10 >= 0) { // L: 10546 + ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10547 + } + } + + var9 = var0.itemActions; // L: 10550 + if (var9 != null) { // L: 10551 + for (var11 = 4; var11 >= 0; --var11) { // L: 10552 + if (var9[var11] != null) { // L: 10553 + byte var12 = 0; // L: 10554 + if (var11 == 0) { // L: 10555 + var12 = 39; + } + + if (var11 == 1) { // L: 10556 + var12 = 40; + } + + if (var11 == 2) { // L: 10557 + var12 = 41; + } + + if (var11 == 3) { // L: 10558 + var12 = 42; + } + + if (var11 == 4) { // L: 10559 + var12 = 43; + } + + EnumComposition.insertMenuItemNoShift(var9[var11], MouseHandler.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10560 + } + } + } + + EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10565 + } + } + } + + ++var13; // L: 10570 } - } catch (IOException var36) { - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class134.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class134.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - JagexCache.JagexCache_idxFiles = new BufferedFile[Bounds.idxCount]; - - for (int var29 = 0; var29 < Bounds.idxCount; ++var29) { - JagexCache.JagexCache_idxFiles[var29] = new BufferedFile(new AccessFile(class134.getFile("main_file_cache.idx" + var29), "rw", 1048576L), 6000, 0); - } - - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;ZI)V", - garbageValue = "-2136687604" - ) - public static void method2490(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; - ObjectComposition.ObjectDefinition_modelsArchive = var1; - ObjectComposition.ObjectDefinition_isLowDetail = var2; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lji;", - garbageValue = "-1874338745" - ) - public static GameBuild method2494(int var0) { - GameBuild[] var1 = class78.method2060(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - GameBuild var3 = var1[var2]; - if (var0 == var3.buildId) { - return var3; } } - return null; - } + if (var0.isIf3) { // L: 10574 + if (Client.isSpellSelected) { // L: 10575 + if (class19.method279(PendingSpawn.getWidgetFlags(var0)) && (class116.selectedSpellFlags & 32) == 32) { // L: 10576 + EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10577 + } + } else { + for (var13 = 9; var13 >= 5; --var13) { // L: 10582 + String var14 = SoundSystem.method785(var0, var13); // L: 10583 + if (var14 != null) { // L: 10584 + EnumComposition.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10585 + } + } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "108" - ) - public static boolean method2493(int var0) { - return (var0 >> 29 & 1) != 0; - } + var3 = class20.Widget_getSpellActionName(var0); // L: 10589 + if (var3 != null) { // L: 10590 + EnumComposition.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10591 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10594 + String var5 = SoundSystem.method785(var0, var4); // L: 10595 + if (var5 != null) { // L: 10596 + ModelData0.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10597 + } + } + + if (ClientPacket.method4710(PendingSpawn.getWidgetFlags(var0))) { // L: 10601 + EnumComposition.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10602 + } + } + } + + } // L: 10607 } diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index f091ccdc73..844e92db3b 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -1,14 +1,35 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dt") public class class115 extends class116 { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -816403893 + @ObfuscatedName("rx") + @ObfuscatedSignature( + descriptor = "Lea;" ) - int field1376; + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("al") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1098796111 + ) + int field1368; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -20,274 +41,63 @@ public class class115 extends class116 { ) class115(class119 var1) { this.this$0 = var1; - this.field1376 = -1; + this.field1368 = -1; // L: 114 + } // L: 116 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" + ) + void vmethod2847(Buffer var1) { + this.field1368 = var1.readUnsignedShort(); // L: 119 + } // L: 120 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" + ) + void vmethod2848(ClanSettings var1) { + var1.method2656(this.field1368); // L: 123 + } // L: 124 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([BB)Lgg;", + garbageValue = "122" + ) + static WorldMapSprite method2554(byte[] var0) { + if (var0 == null) { // L: 19 + return new WorldMapSprite(); + } else { + BufferedImage var2 = null; // L: 22 + + SpritePixels var1; + try { + var2 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 24 + int var3 = var2.getWidth(); // L: 25 + int var4 = var2.getHeight(); // L: 26 + int[] var5 = new int[var4 * var3]; // L: 27 + PixelGrabber var6 = new PixelGrabber(var2, 0, 0, var3, var4, var5, 0, var3); // L: 28 + var6.grabPixels(); // L: 29 + var1 = new SpritePixels(var5, var3, var4); // L: 30 + return new WorldMapSprite(var1.pixels); // L: 37 + } catch (IOException var8) { // L: 33 + } catch (InterruptedException var9) { // L: 34 + } + + var1 = new SpritePixels(0, 0); // L: 35 + return new WorldMapSprite(var1.pixels); + } } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-473426033" ) - void vmethod2767(Buffer var1) { - this.field1376 = var1.readUnsignedShort(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" - ) - void vmethod2766(ClanSettings var1) { - var1.method2589(this.field1376); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIIIIILhy;Lfy;I)V", - garbageValue = "-1093015978" - ) - static final void method2495(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectComposition var9 = class245.getObjectDefinition(var4); - int var10; - int var11; - if (var5 != 1 && var5 != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; - } else { - var10 = var9.sizeY; - var11 = var9.sizeX; - } - - int var12; - int var13; - if (var10 + var2 <= 104) { - var12 = (var10 >> 1) + var2; - var13 = var2 + (var10 + 1 >> 1); - } else { - var12 = var2; - var13 = var2 + 1; - } - - int var14; - int var15; - if (var3 + var11 <= 104) { - var14 = var3 + (var11 >> 1); - var15 = var3 + (var11 + 1 >> 1); - } else { - var14 = var3; - var15 = var3 + 1; - } - - int[][] var16 = Tiles.Tiles_heights[var1]; - int var17 = var16[var12][var14] + var16[var13][var14] + var16[var12][var15] + var16[var13][var15] >> 2; - int var18 = (var2 << 7) + (var10 << 6); - int var19 = (var3 << 7) + (var11 << 6); - long var20 = class247.calculateTag(var2, var3, 2, var9.int1 == 0, var4); - int var22 = (var5 << 6) + var6; - if (var9.int3 == 1) { - var22 += 256; - } - - Object var30; - if (var6 == 22) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(22, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); - if (var9.interactType == 1) { - var8.setBlockedByFloorDec(var2, var3); - } - - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.method4208(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 0) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field985[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3416(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field986[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3416(var2, var3, var6, var5, var9.boolean1); - } - - } else { - int var23; - if (var6 == 2) { - var23 = var5 + 1 & 3; - Object var25; - Object var31; - if (var9.animationId == -1 && var9.transforms == null) { - var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); - var25 = var9.getModel(2, var23, var16, var18, var17, var19); - } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field985[var5], Tiles.field985[var23], var20, var22); - if (var9.interactType != 0) { - var8.method3416(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 3) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field986[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3416(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.method4208(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 4) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field985[var5], 0, 0, 0, var20, var22); - } else { - long var24; - Object var26; - if (var6 == 5) { - var23 = 16; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var24 != 0L) { - var23 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var24)).int2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field985[var5], 0, var23 * Tiles.field987[var5], var23 * Tiles.field988[var5], var20, var22); - } else if (var6 == 6) { - var23 = 8; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (0L != var24) { - var23 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var24)).int2 / 2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field980[var5], var23 * Tiles.field979[var5], var20, var22); - } else if (var6 == 7) { - int var29 = var5 + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); - } else if (var6 == 8) { - var23 = 8; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var24 != 0L) { - var23 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var24)).int2 / 2; - } - - int var28 = var5 + 2 & 3; - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field980[var5], var23 * Tiles.field979[var5], var20, var22); - } - } - } - } else { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); - } - - if (var30 != null) { - var7.method4208(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-47" - ) - static final void method2501() { - Client.field559 = 0; - int var0 = (class67.localPlayer.x >> 7) + WorldMapSectionType.baseX; - int var1 = (class67.localPlayer.y >> 7) + PlayerComposition.baseY; - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field559 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field559 = 1; - } - - if (Client.field559 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field559 = 0; - } - + public static String method2555(CharSequence var0) { + return Message.method1149('*', var0.length()); // L: 201 } } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 20f66c83ed..da5357d79e 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -1,327 +1,31 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dy") public abstract class class116 extends Node { - @ObfuscatedName("rp") - @ObfuscatedSignature( - descriptor = "Laq;" + @ObfuscatedName("ns") + @ObfuscatedGetter( + intValue = 670075911 ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + @Export("selectedSpellFlags") + static int selectedSpellFlags; class116() { - } + } // L: 68 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - abstract void vmethod2767(Buffer var1); + abstract void vmethod2847(Buffer var1); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - abstract void vmethod2766(ClanSettings var1); - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "1969424851" - ) - public static int method2510(CharSequence var0, int var1) { - return Language.method5477(var0, var1, true); - } - - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(Lcd;II)V", - garbageValue = "-855242752" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - SequenceDefinition var2; - int var3; - int var4; - int var11; - if (var0.field1145 >= Client.cycle) { - var11 = Math.max(1, var0.field1145 - Client.cycle); - var3 = var0.field1109 * 64 + var0.field1148 * 128; - var4 = var0.field1109 * 64 + var0.field1126 * 128; - var0.x += (var3 - var0.x) / var11; - var0.y += (var4 - var0.y) / var11; - var0.field1164 = 0; - var0.orientation = var0.field1151; - } else if (var0.field1165 >= Client.cycle) { - Client.method1589(var0); - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1164 = 0; - } else { - label399: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = KitDefinition.SequenceDefinition_get(var0.sequence); - if (var0.field1129 > 0 && var2.field1959 == 0) { - ++var0.field1164; - break label399; - } - - if (var0.field1129 <= 0 && var2.field1960 == 0) { - ++var0.field1164; - break label399; - } - } - - var11 = var0.x; - var3 = var0.y; - var4 = var0.field1109 * 64 + var0.pathX[var0.pathLength - 1] * 128; - int var5 = var0.field1109 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var11 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var11 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; - } - - byte var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - int var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1146 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1164 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1164; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1164 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1164; - } - } - - if (var6 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var4 != var11 || var5 != var3) { - if (var11 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var11 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1129 > 0) { - --var0.field1129; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1129 > 0) { - --var0.field1129; - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1145 = 0; - var0.field1165 = 0; - var0.x = var0.pathX[0] * 128 + var0.field1109 * 64; - var0.y = var0.field1109 * 64 + var0.pathY[0] * 128; - var0.method2137(); - } - - if (class67.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1145 = 0; - var0.field1165 = 0; - var0.x = var0.field1109 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field1109 * 64; - var0.method2137(); - } - - class328.method5930(var0); - var0.isWalking = false; - if (var0.movementSequence != -1) { - var2 = KitDefinition.SequenceDefinition_get(var0.movementSequence); - if (var2 != null && var2.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - class134.method2716(var2, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var2.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - class134.method2716(var2, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1105) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - var11 = class21.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var11 != -1) { - SequenceDefinition var12 = KitDefinition.SequenceDefinition_get(var11); - if (var12 != null && var12.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - class134.method2716(var12, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var2 = KitDefinition.SequenceDefinition_get(var0.sequence); - if (var2.field1959 == 1 && var0.field1129 > 0 && var0.field1145 <= Client.cycle && var0.field1165 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = KitDefinition.SequenceDefinition_get(var0.sequence); - if (var2 != null && var2.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - class134.method2716(var2, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var2.frameIds.length) { - var0.sequenceFrame -= var2.frameCount; - ++var0.field1142; - if (var0.field1142 >= var2.field1952) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { - class134.method2716(var2, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var2.field1945; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } + abstract void vmethod2848(ClanSettings var1); } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 7a3a448372..d363af0e74 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -3,18 +3,15 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("ds") public class class117 extends class116 { - @ObfuscatedName("p") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 408347163 + intValue = -1054010885 ) - int field1385; - @ObfuscatedName("q") - boolean field1383; + int field1378; + @ObfuscatedName("w") + boolean field1375; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -26,192 +23,195 @@ public class class117 extends class116 { ) class117(class119 var1) { this.this$0 = var1; - this.field1385 = -1; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" - ) - void vmethod2767(Buffer var1) { - this.field1385 = var1.readUnsignedShort(); - this.field1383 = var1.readUnsignedByte() == 1; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" - ) - void vmethod2766(ClanSettings var1) { - var1.method2595(this.field1385, this.field1383); - } + this.field1378 = -1; // L: 178 + } // L: 181 @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljt;IIIB)V", - garbageValue = "85" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3147 == null) { - throw new RuntimeException(); + void vmethod2847(Buffer var1) { + this.field1378 = var1.readUnsignedShort(); // L: 184 + this.field1375 = var1.readUnsignedByte() == 1; // L: 185 + } // L: 186 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" + ) + void vmethod2848(ClanSettings var1) { + var1.method2662(this.field1378, this.field1375); // L: 189 + } // L: 190 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1364170988" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 158 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Low;", + garbageValue = "-115532450" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 357 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 358 + var4 = 1; + } + + long var6 = ((long)var3 << 42) + ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38); // L: 359 + SpritePixels var8; + if (!var5) { // L: 361 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362 + if (var8 != null) { // L: 363 + return var8; + } + } + + ItemComposition var9 = TaskHandler.ItemDefinition_get(var0); // L: 365 + if (var1 > 1 && var9.countobj != null) { // L: 366 + int var10 = -1; // L: 367 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 368 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 371 + var9 = TaskHandler.ItemDefinition_get(var10); + } + } + + Model var21 = var9.getModel(1); // L: 373 + if (var21 == null) { // L: 374 + return null; } else { - var0.field3147[var1] = var2; - var0.field3066[var1] = var3; + 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 + 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 + 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 + 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.method4205(16, 16); // L: 397 + Rasterizer3D.field2367 = false; // L: 398 + if (var9.placeholderTemplate != -1) { // L: 399 + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 400 + if (var5) { // L: 401 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 402 + var16 = (int)((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.method4539(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 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 408 + var8.outline(1); + } + + if (var2 >= 2) { // L: 409 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 410 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411 + if (var9.noteTemplate != -1) { // L: 412 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413 + Font var19 = SoundSystem.ItemDefinition_fontPlain11; // L: 414 + String var20; + if (var1 < 100000) { // L: 417 + var20 = "" + var1 + ""; // L: 418 + } else if (var1 < 10000000) { // L: 421 + var20 = "" + var1 / 1000 + "K" + ""; // L: 422 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 425 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 427 + } + + if (!var5) { // L: 429 + 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.field2367 = true; // L: 433 + return var8; // L: 434 } } - @ObfuscatedName("gw") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2104571649" + descriptor = "(III)I", + garbageValue = "969588273" ) - static final int method2519() { - if (WorldMapDecorationType.clientPreferences.roofsHidden) { - return VertexNormal.Client_plane; - } else { - int var0 = 3; - if (WorldMapIcon_1.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = class132.oculusOrbFocalPointX >> 7; - var2 = LoginScreenAnimation.oculusOrbFocalPointY >> 7; - } else { - var1 = class67.localPlayer.x >> 7; - var2 = class67.localPlayer.y >> 7; - } - - int var3 = Canvas.cameraX >> 7; - int var4 = VarpDefinition.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return VertexNormal.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return VertexNormal.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][var3][var4] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var3 != var1) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][var3][var4] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][var3][var4] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][var3][var4] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][var3][var4] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - } - } - } - } - - if (class67.localPlayer.x >= 0 && class67.localPlayer.y >= 0 && class67.localPlayer.x < 13312 && class67.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[VertexNormal.Client_plane][class67.localPlayer.x >> 7][class67.localPlayer.y >> 7] & 4) != 0) { - var0 = VertexNormal.Client_plane; - } - - return var0; - } else { - return VertexNormal.Client_plane; - } - } + static final int method2573(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 564 + var2 ^= var2 << 13; // L: 565 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 566 + return var3 >> 19 & 255; // L: 567 } - @ObfuscatedName("gq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lci;I)Z", - garbageValue = "-1848205282" + descriptor = "([BIII)I", + garbageValue = "-1335123440" ) - static boolean method2516(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; - } else if (class67.localPlayer == var0) { - return class317.method5800(); - } else { - boolean var1 = KitDefinition.method2954(); - boolean var2; - if (!var1) { - var2 = (Client.drawPlayerNames & 1) != 0; - var1 = var2 && var0.isFriend(); - } + static int method2565(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 47 - var2 = var1; - if (!var1) { - boolean var3 = (Client.drawPlayerNames & 2) != 0; - var2 = var3 && var0.isFriendsChatMember(); - } - - return var2; + for (int var4 = var1; var4 < var2; ++var4) { // L: 48 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 } + + var3 = ~var3; // L: 51 + return var3; // L: 52 } } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java index 8832533332..be62dda7a1 100644 --- a/runescape-client/src/main/java/class119.java +++ b/runescape-client/src/main/java/class119.java @@ -5,129 +5,116 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dg") public class class119 { - @ObfuscatedName("tp") + @ObfuscatedName("ho") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 1593022172438021303L + longValue = 1922253905166501201L ) - static long field1395; - @ObfuscatedName("if") + long field1399; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1571580783 + ) + int field1396; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "Lkf;" ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -4273243190506141755L - ) - long field1396; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 49116901 - ) - int field1399; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkt;" - ) - IterableNodeDeque field1397; + IterableNodeDeque field1390; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) public class119(Buffer var1) { - this.field1399 = -1; - this.field1397 = new IterableNodeDeque(); - this.method2521(var1); + this.field1396 = -1; // L: 9 + this.field1390 = new IterableNodeDeque(); // L: 10 + this.method2578(var1); } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "54600340" + descriptor = "(Lop;B)V", + garbageValue = "113" ) - void method2521(Buffer var1) { - this.field1396 = var1.readLong(); - this.field1399 = var1.readInt(); + void method2578(Buffer var1) { + this.field1399 = var1.readLong(); // L: 32 + this.field1396 = var1.readInt(); // L: 33 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 Object var3; - if (var2 == 3) { + if (var2 == 3) { // L: 37 var3 = new class138(this); - } else if (var2 == 1) { + } else if (var2 == 1) { // L: 38 var3 = new class114(this); - } else if (var2 == 13) { + } else if (var2 == 13) { // L: 39 var3 = new class131(this); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 40 var3 = new class123(this); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 41 var3 = new class130(this); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 42 var3 = new class115(this); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 43 var3 = new class120(this); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 44 var3 = new class113(this); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 45 var3 = new class117(this); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 46 var3 = new class134(this); - } else if (var2 == 9) { + } else if (var2 == 9) { // L: 47 var3 = new class140(this); - } else if (var2 == 10) { + } else if (var2 == 10) { // L: 48 var3 = new class126(this); - } else if (var2 == 11) { + } else if (var2 == 11) { // L: 49 var3 = new class121(this); - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 50 var3 = new class125(this); } else { - if (var2 != 15) { - throw new RuntimeException(""); + if (var2 != 15) { // L: 51 + throw new RuntimeException(""); // L: 52 } var3 = new class135(this); } - ((class116)var3).vmethod2767(var1); - this.field1397.addFirst((Node)var3); + ((class116)var3).vmethod2847(var1); // L: 53 + this.field1390.addFirst((Node)var3); // L: 54 } - } + } // L: 57 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "1587577632" + descriptor = "(Ldm;S)V", + garbageValue = "12513" ) - public void method2522(ClanSettings var1) { - if (var1.field1446 == this.field1396 && this.field1399 == var1.field1447) { - for (class116 var2 = (class116)this.field1397.last(); var2 != null; var2 = (class116)this.field1397.previous()) { - var2.vmethod2766(var1); + public void method2577(ClanSettings var1) { + if (this.field1399 == var1.field1456 && this.field1396 == var1.field1465) { // L: 60 + for (class116 var2 = (class116)this.field1390.last(); var2 != null; var2 = (class116)this.field1390.previous()) { // L: 61 + var2.vmethod2848(var1); // L: 62 } - ++var1.field1447; + ++var1.field1465; // L: 64 } else { throw new RuntimeException(""); } - } + } // L: 65 - @ObfuscatedName("ip") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "63" + descriptor = "(II)I", + garbageValue = "-1929405904" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + FloorUnderlayDefinition.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + FloorUnderlayDefinition.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + FloorUnderlayDefinition.colorStartTag(16776960) + var1 + ""; - } + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = class150.method2965(var0); // L: 24 + int var2 = var1.baseVar; // L: 25 + int var3 = var1.startBit; // L: 26 + int var4 = var1.endBit; // L: 27 + int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 + return Varps.Varps_main[var2] >> var3 & var5; // L: 29 } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index d6426f0d53..a0691216e0 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,4 +1,3 @@ -import java.awt.Component; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -7,26 +6,35 @@ import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; import org.bouncycastle.crypto.tls.TlsClientProtocol; -@ObfuscatedName("g") +@ObfuscatedName("k") class class12 extends SSLSocket { - @ObfuscatedName("k") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("eg") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Loe;" ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("l") - Certificate[] field65; + static IndexedSprite field54; + @ObfuscatedName("cg") + @ObfuscatedGetter( + intValue = -1033236073 + ) + public static int field55; + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("i") + Certificate[] field53; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lu;" ) final class15 this$0; // $FF: synthetic field @@ -35,183 +43,944 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Lc;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lu;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; + this.this$0 = var1; // L: 83 this.val$tlsClientProtocol = var2; this.val$host = var3; } - public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } - - public String[] getEnabledCipherSuites() { - return null; - } - public String[] getEnabledProtocols() { - return null; - } - - public SSLSession getSession() { - return new class17(this); - } - - public String[] getSupportedProtocols() { - return null; - } - - public void setEnableSessionCreation(boolean var1) { - } - - public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { - } - - public String[] getSupportedCipherSuites() { - return null; - } - - public void setEnabledProtocols(String[] var1) { - } - - public void setNeedClientAuth(boolean var1) { - } - - public void setUseClientMode(boolean var1) { - } - - public void setWantClientAuth(boolean var1) { - } - - public boolean getWantClientAuth() { - return false; - } - - public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); - } - - public boolean getUseClientMode() { - return false; - } - - public boolean getEnableSessionCreation() { - return false; + return null; // L: 109 } public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); + return this.val$tlsClientProtocol.getInputStream(); // L: 87 } + public synchronized void close() throws IOException { + this.val$tlsClientProtocol.close(); // L: 95 + } // L: 96 + + public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 98 + + public boolean getEnableSessionCreation() { + return false; // L: 101 + } + + public String[] getEnabledCipherSuites() { + return null; // L: 105 + } + + public String[] getSupportedProtocols() { + return null; // L: 205 + } + + public String[] getSupportedCipherSuites() { + return null; // L: 209 + } + + public void setEnableSessionCreation(boolean var1) { + } // L: 221 + + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 220 + public void setEnabledCipherSuites(String[] var1) { + } // L: 222 + + public void setNeedClientAuth(boolean var1) { + } // L: 224 + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); // L: 229 + } // L: 275 + + public SSLSession getSession() { + return new class17(this); // L: 117 + } + + public void setWantClientAuth(boolean var1) { + } // L: 226 + + public void setEnabledProtocols(String[] var1) { + } // L: 223 + + public boolean getWantClientAuth() { + return false; // L: 217 } public boolean getNeedClientAuth() { - return false; + return false; // L: 113 } - public void startHandshake() throws IOException { - this.val$tlsClientProtocol.connect(new class13(this)); - } + public void setUseClientMode(boolean var1) { + } // L: 225 public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); + return this.val$tlsClientProtocol.getOutputStream(); // L: 91 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1286824379" - ) - static void method157(Component var0) { - var0.setFocusTraversalKeysEnabled(false); - var0.addKeyListener(KeyHandler.KeyHandler_instance); - var0.addFocusListener(KeyHandler.KeyHandler_instance); + public boolean getUseClientMode() { + return false; // L: 213 } - @ObfuscatedName("as") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lav;I)V", - garbageValue = "721847828" + descriptor = "(Lle;Lle;Lle;I)V", + garbageValue = "31635471" ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 941 + Login.loginBoxX = Login.xPadding + 202; // L: 942 + Login.loginBoxCenter = Login.loginBoxX + 180; // L: 943 + byte var3; + int var4; + int var8; + boolean var15; + int var16; + int var25; + int var33; + int var43; + if (Login.worldSelectOpen) { // L: 944 + int var47; + if (DirectByteArrayCopier.worldSelectBackSprites == null) { // L: 946 + Archive var44 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 948 + var43 = var44.getGroupId("sl_back"); // L: 950 + var47 = var44.getFileId(var43, ""); // L: 951 + SpritePixels[] var45 = class21.method312(var44, var43, var47); // L: 952 + DirectByteArrayCopier.worldSelectBackSprites = var45; // L: 954 + } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } + if (UserComparator7.worldSelectFlagSprites == null) { // L: 956 + UserComparator7.worldSelectFlagSprites = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_flags", ""); + } - } + if (class54.worldSelectArrows == null) { // L: 957 + class54.worldSelectArrows = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_arrows", ""); + } - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "496885039" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 < 0 || AbstractArchive.field3706 != 0 && var3 > AbstractArchive.field3706) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var6 = new byte[var3]; - var1.readBytes(var6, 0, var3); - return var6; - } else { - int var4 = var1.readInt(); - if (var4 >= 0 && (AbstractArchive.field3706 == 0 || var4 <= AbstractArchive.field3706)) { - byte[] var5 = new byte[var4]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + if (KeyHandler.worldSelectStars == null) { // L: 958 + KeyHandler.worldSelectStars = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_stars", ""); + } + + if (UserComparator6.worldSelectLeftSprite == null) { // L: 959 + UserComparator6.worldSelectLeftSprite = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "leftarrow", ""); + } + + if (MouseRecorder.worldSelectRightSprite == null) { // L: 960 + MouseRecorder.worldSelectRightSprite = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 961 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 962 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 963 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 964 + if (KeyHandler.worldSelectStars != null) { // L: 965 + KeyHandler.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 966 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 967 + KeyHandler.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 968 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 969 + } + + if (class54.worldSelectArrows != null) { // L: 971 + var33 = Login.xPadding + 280; // L: 972 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 973 + class54.worldSelectArrows[2].drawAt(var33, 4); } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); + class54.worldSelectArrows[0].drawAt(var33, 4); // L: 974 } - return var5; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 975 + class54.worldSelectArrows[3].drawAt(var33 + 15, 4); + } else { + class54.worldSelectArrows[1].drawAt(var33 + 15, 4); // L: 976 + } + + var0.draw("World", var33 + 32, 17, 16777215, -1); // L: 977 + var4 = Login.xPadding + 390; // L: 978 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 979 + class54.worldSelectArrows[2].drawAt(var4, 4); + } else { + class54.worldSelectArrows[0].drawAt(var4, 4); // L: 980 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 981 + class54.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class54.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 982 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 983 + var43 = Login.xPadding + 500; // L: 984 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 985 + class54.worldSelectArrows[2].drawAt(var43, 4); + } else { + class54.worldSelectArrows[0].drawAt(var43, 4); // L: 986 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 987 + class54.worldSelectArrows[3].drawAt(var43 + 15, 4); + } else { + class54.worldSelectArrows[1].drawAt(var43 + 15, 4); // L: 988 + } + + var0.draw("Location", var43 + 32, 17, 16777215, -1); // L: 989 + var47 = Login.xPadding + 610; // L: 990 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 991 + class54.worldSelectArrows[2].drawAt(var47, 4); + } else { + class54.worldSelectArrows[0].drawAt(var47, 4); // L: 992 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 993 + class54.worldSelectArrows[3].drawAt(var47 + 15, 4); + } else { + class54.worldSelectArrows[1].drawAt(var47 + 15, 4); // L: 994 + } + + var0.draw("Type", var47 + 32, 17, 16777215, -1); // L: 995 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 997 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 998 + Login.hoveredWorldIndex = -1; // L: 999 + if (DirectByteArrayCopier.worldSelectBackSprites != null) { // L: 1000 + var3 = 88; // L: 1001 + byte var39 = 19; // L: 1002 + var43 = 765 / (var3 + 1) - 1; // L: 1003 + var47 = 480 / (var39 + 1); // L: 1004 + + do { + var25 = var47; // L: 1006 + var8 = var43; // L: 1007 + if (var47 * (var43 - 1) >= World.World_count) { // L: 1008 + --var43; + } + + if (var43 * (var47 - 1) >= World.World_count) { // L: 1009 + --var47; + } + + if (var43 * (var47 - 1) >= World.World_count) { // L: 1010 + --var47; + } + } while(var47 != var25 || var43 != var8); // L: 1011 + + var25 = (765 - var3 * var43) / (var43 + 1); // L: 1013 + if (var25 > 5) { // L: 1014 + var25 = 5; + } + + var8 = (480 - var39 * var47) / (var47 + 1); // L: 1015 + if (var8 > 5) { // L: 1016 + var8 = 5; + } + + int var28 = (765 - var3 * var43 - var25 * (var43 - 1)) / 2; // L: 1017 + int var37 = (480 - var39 * var47 - var8 * (var47 - 1)) / 2; // L: 1018 + int var38 = (var47 + World.World_count - 1) / var47; // L: 1019 + Login.worldSelectPagesCount = var38 - var43; // L: 1020 + if (UserComparator6.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1021 + UserComparator6.worldSelectLeftSprite.drawAt(8, KeyHandler.canvasHeight / 2 - UserComparator6.worldSelectLeftSprite.subHeight / 2); // L: 1022 + } + + if (MouseRecorder.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1024 + MouseRecorder.worldSelectRightSprite.drawAt(GameEngine.canvasWidth - MouseRecorder.worldSelectRightSprite.subWidth - 8, KeyHandler.canvasHeight / 2 - MouseRecorder.worldSelectRightSprite.subHeight / 2); // L: 1025 + } + + int var29 = var37 + 23; // L: 1027 + int var30 = var28 + Login.xPadding; // L: 1028 + int var40 = 0; // L: 1029 + var15 = false; // L: 1030 + var16 = Login.worldSelectPage; // L: 1031 + + int var41; + for (var41 = var16 * var47; var41 < World.World_count && var16 - Login.worldSelectPage < var43; ++var41) { // L: 1032 1033 + World var18 = WorldMapEvent.World_worlds[var41]; // L: 1036 + boolean var19 = true; // L: 1037 + String var20 = Integer.toString(var18.population); // L: 1038 + if (var18.population == -1) { // L: 1039 + var20 = "OFF"; // L: 1040 + var19 = false; // L: 1041 + } else if (var18.population > 1980) { // L: 1043 + var20 = "FULL"; // L: 1044 + var19 = false; // L: 1045 + } + + int var22 = 0; // L: 1048 + byte var21; + if (var18.isBeta()) { // L: 1049 + if (var18.isMembersOnly()) { // L: 1050 + var21 = 7; + } else { + var21 = 6; // L: 1051 + } + } else if (var18.isDeadman()) { // L: 1053 + var22 = 16711680; // L: 1054 + if (var18.isMembersOnly()) { // L: 1055 + var21 = 5; + } else { + var21 = 4; // L: 1056 + } + } else if (var18.method1652()) { // L: 1058 + if (var18.isMembersOnly()) { // L: 1059 + var21 = 9; + } else { + var21 = 8; // L: 1060 + } + } else if (var18.isPvp()) { // L: 1062 + if (var18.isMembersOnly()) { // L: 1063 + var21 = 3; + } else { + var21 = 2; // L: 1064 + } + } else if (var18.isMembersOnly()) { // L: 1067 + var21 = 1; + } else { + var21 = 0; // L: 1068 + } + + if (MouseHandler.MouseHandler_x >= var30 && MouseHandler.MouseHandler_y >= var29 && MouseHandler.MouseHandler_x < var3 + var30 && MouseHandler.MouseHandler_y < var29 + var39 && var19) { // L: 1070 + Login.hoveredWorldIndex = var41; // L: 1071 + DirectByteArrayCopier.worldSelectBackSprites[var21].drawTransOverlayAt(var30, var29, 128, 16777215); // L: 1072 + var15 = true; // L: 1073 + } else { + DirectByteArrayCopier.worldSelectBackSprites[var21].drawAt(var30, var29); // L: 1075 + } + + if (UserComparator7.worldSelectFlagSprites != null) { // L: 1076 + UserComparator7.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var30 + 29, var29); + } + + var0.drawCentered(Integer.toString(var18.id), var30 + 15, var39 / 2 + var29 + 5, var22, -1); // L: 1077 + var1.drawCentered(var20, var30 + 60, var39 / 2 + var29 + 5, 268435455, -1); // L: 1078 + var29 = var29 + var8 + var39; // L: 1079 + ++var40; // L: 1080 + if (var40 >= var47) { + var29 = var37 + 23; // L: 1081 + var30 = var30 + var3 + var25; // L: 1082 + var40 = 0; // L: 1083 + ++var16; // L: 1084 + } + } + + if (var15) { // L: 1087 + var41 = var1.stringWidth(WorldMapEvent.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1088 + int var31 = var1.ascent + 8; // L: 1089 + int var42 = MouseHandler.MouseHandler_y + 25; // L: 1090 + if (var31 + var42 > 480) { // L: 1091 + var42 = MouseHandler.MouseHandler_y - 25 - var31; // L: 1092 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var41 / 2, var42, var41, var31, 16777120); // L: 1094 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var41 / 2, var42, var41, var31, 0); // L: 1095 + var1.drawCentered(WorldMapEvent.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); // L: 1096 + } + } + + Canvas.rasterProvider.drawFull(0, 0); // L: 1099 + } else { + RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1103 + class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1104 + class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 1105 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1106 + var3 = 20; // L: 1107 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1108 + var4 = 253 - var3; // L: 1109 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1110 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1111 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1112 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1113 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1114 + } + + String var5; + String var6; + String var7; + short var32; + short var34; + if (Client.gameState == 20) { // L: 1116 + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1117 + var32 = 201; // L: 1118 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1119 + var33 = var32 + 15; // L: 1120 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1121 + var33 += 15; // L: 1122 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1123 + var33 += 15; // L: 1124 + var33 += 7; // L: 1125 + if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1126 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var33, 16777215, 0); // L: 1127 + var34 = 200; // L: 1128 + var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1131 + + for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(0, var6.length() - 1)) { // L: 1133 1134 1135 + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var33, 16777215, 0); // L: 1137 + var33 += 15; // L: 1138 + + for (var7 = class115.method2555(Login.Login_password); var0.stringWidth(var7) > var34; var7 = var7.substring(1)) { // L: 1139 1140 1141 + } + + var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1143 + var33 += 15; // L: 1144 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 1147 + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1148 + short var23; + if (Login.loginIndex == 0) { // L: 1149 + var32 = 251; // L: 1150 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1151 + var33 = var32 + 30; // L: 1152 + var4 = Login.loginBoxX + 180 - 80; // L: 1153 + var23 = 291; // L: 1154 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1155 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1156 + var4 = Login.loginBoxX + 180 + 80; // L: 1157 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1158 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1159 + } else if (Login.loginIndex == 1) { // L: 1161 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1162 + var32 = 236; // L: 1163 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1164 + var33 = var32 + 15; // L: 1165 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1166 + var33 += 15; // L: 1167 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1168 + var33 += 15; // L: 1169 + var4 = Login.loginBoxX + 180 - 80; // L: 1170 + var23 = 321; // L: 1171 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1172 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1173 + var4 = Login.loginBoxX + 180 + 80; // L: 1174 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1175 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1176 + } else if (Login.loginIndex == 2) { // L: 1178 + var32 = 201; // L: 1179 + var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var32, 16776960, 0); // L: 1180 + var33 = var32 + 15; // L: 1181 + var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var33, 16776960, 0); // L: 1182 + var33 += 15; // L: 1183 + var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var33, 16776960, 0); // L: 1184 + var33 += 15; // L: 1185 + var33 += 7; // L: 1186 + var0.draw("Login: ", Login.loginBoxCenter - 110, var33, 16777215, 0); // L: 1187 + var34 = 200; // L: 1188 + var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1191 + + for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1193 1194 1195 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var33, 16777215, 0); // L: 1197 + var33 += 15; // L: 1198 + + for (var7 = class115.method2555(Login.Login_password); var0.stringWidth(var7) > var34; var7 = var7.substring(1)) { // L: 1199 1200 1201 + } + + var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var33, 16777215, 0); // L: 1203 + var33 += 15; // L: 1204 + var32 = 277; // L: 1205 + var8 = Login.loginBoxCenter + -117; // L: 1206 + boolean var10 = Client.Login_isUsernameRemembered; // L: 1208 + boolean var11 = Login.field873; // L: 1209 + IndexedSprite var9 = var10 ? (var11 ? ClanMate.field3950 : class9.options_buttons_2Sprite) : (var11 ? Login.field868 : NetSocket.options_buttons_0Sprite); // L: 1211 + var9.drawAt(var8, var32); // L: 1214 + var8 = var8 + var9.subWidth + 5; // L: 1215 + var1.draw("Remember username", var8, var32 + 13, 16776960, 0); // L: 1216 + var8 = Login.loginBoxCenter + 24; // L: 1217 + boolean var14 = class408.clientPreferences.hideUsername; // L: 1219 + var15 = Login.field860; // L: 1220 + IndexedSprite var13 = var14 ? (var15 ? ClanMate.field3950 : class9.options_buttons_2Sprite) : (var15 ? Login.field868 : NetSocket.options_buttons_0Sprite); // L: 1222 + var13.drawAt(var8, var32); // L: 1225 + var8 = var8 + var13.subWidth + 5; // L: 1226 + var1.draw("Hide username", var8, var32 + 13, 16776960, 0); // L: 1227 + var33 = var32 + 15; // L: 1228 + var16 = Login.loginBoxCenter - 80; // L: 1229 + short var17 = 321; // L: 1230 + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1231 + var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); // L: 1232 + var16 = Login.loginBoxCenter + 80; // L: 1233 + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1234 + var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); // L: 1235 + var32 = 357; // L: 1236 + switch(Login.field865) { // L: 1237 + case 2: + UserComparator6.field1340 = "Having trouble logging in?"; // L: 1242 + break; + default: + UserComparator6.field1340 = "Can't login? Click here."; // L: 1239 + } + + class114.field1359 = new Bounds(Login.loginBoxCenter, var32, var1.stringWidth(UserComparator6.field1340), 11); // L: 1245 + ItemContainer.field998 = new Bounds(Login.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1246 + var1.drawCentered(UserComparator6.field1340, Login.loginBoxCenter, var32, 16777215, 0); // L: 1247 + } else if (Login.loginIndex == 3) { // L: 1249 + var32 = 201; // L: 1250 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1251 + var33 = var32 + 20; // L: 1252 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1253 + var33 += 15; // L: 1254 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1255 + var33 += 15; // L: 1256 + var4 = Login.loginBoxX + 180; // L: 1257 + var23 = 276; // L: 1258 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1259 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1260 + var4 = Login.loginBoxX + 180; // L: 1261 + var23 = 326; // L: 1262 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1263 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1264 + } else { + short var36; + if (Login.loginIndex == 4) { // L: 1266 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1267 + var32 = 236; // L: 1268 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1269 + var33 = var32 + 15; // L: 1270 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1271 + var33 += 15; // L: 1272 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1273 + var33 += 15; // L: 1274 + var0.draw("PIN: " + class115.method2555(Tiles.otp) + (Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1275 + var33 -= 8; // L: 1276 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1277 + var33 += 15; // L: 1278 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1279 + var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1280 + var43 = var33 - var0.ascent; // L: 1281 + IndexedSprite var35; + if (Login.field875) { // L: 1283 + var35 = class9.options_buttons_2Sprite; // L: 1284 + } else { + var35 = NetSocket.options_buttons_0Sprite; // L: 1287 + } + + var35.drawAt(var4, var43); // L: 1289 + var33 += 15; // L: 1290 + var25 = Login.loginBoxX + 180 - 80; // L: 1291 + var36 = 321; // L: 1292 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1293 + var0.drawCentered("Continue", var25, var36 + 5, 16777215, 0); // L: 1294 + var25 = Login.loginBoxX + 180 + 80; // L: 1295 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1296 + var0.drawCentered("Cancel", var25, var36 + 5, 16777215, 0); // L: 1297 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var36 + 36, 255, 0); // L: 1298 + } else if (Login.loginIndex == 5) { // L: 1300 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1301 + var32 = 221; // L: 1302 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1303 + var33 = var32 + 15; // L: 1304 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1305 + var33 += 15; // L: 1306 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1307 + var33 += 15; // L: 1308 + var33 += 14; // L: 1309 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var33, 16777215, 0); // L: 1310 + var34 = 174; // L: 1311 + var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1314 + + for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1316 1317 1318 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var33, 16777215, 0); // L: 1320 + var33 += 15; // L: 1321 + var25 = Login.loginBoxX + 180 - 80; // L: 1322 + var36 = 321; // L: 1323 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1324 + var0.drawCentered("Recover", var25, var36 + 5, 16777215, 0); // L: 1325 + var25 = Login.loginBoxX + 180 + 80; // L: 1326 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1327 + var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); // L: 1328 + var36 = 356; // L: 1329 + var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var36, 268435455, 0); // L: 1330 + } else if (Login.loginIndex == 6) { // L: 1332 + var32 = 201; // L: 1333 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1334 + var33 = var32 + 15; // L: 1335 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1336 + var33 += 15; // L: 1337 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1338 + var33 += 15; // L: 1339 + var4 = Login.loginBoxX + 180; // L: 1340 + var23 = 321; // L: 1341 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1342 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1343 + } else if (Login.loginIndex == 7) { // L: 1345 + var32 = 216; // L: 1346 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1347 + var33 = var32 + 15; // L: 1348 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1349 + var33 += 15; // L: 1350 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1351 + var33 += 15; // L: 1352 + var4 = Login.loginBoxX + 180 - 80; // L: 1353 + var23 = 321; // L: 1354 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1355 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1356 + var4 = Login.loginBoxX + 180 + 80; // L: 1357 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1358 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1359 + } else if (Login.loginIndex == 8) { // L: 1361 + var32 = 216; // L: 1362 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1363 + var33 = var32 + 15; // L: 1364 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1365 + var33 += 15; // L: 1366 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1367 + var33 += 15; // L: 1368 + var4 = Login.loginBoxX + 180 - 80; // L: 1369 + var23 = 321; // L: 1370 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1371 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1372 + var4 = Login.loginBoxX + 180 + 80; // L: 1373 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1374 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1375 + } else if (Login.loginIndex == 9) { // L: 1377 + var32 = 221; // L: 1378 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1379 + var33 = var32 + 25; // L: 1380 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1381 + var33 += 25; // L: 1382 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1383 + var4 = Login.loginBoxX + 180; // L: 1384 + var23 = 311; // L: 1385 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1386 + var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1387 + } else if (Login.loginIndex == 10) { // L: 1389 + var33 = Login.loginBoxX + 180; // L: 1390 + var34 = 209; // L: 1391 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1392 + var4 = var34 + 20; // L: 1393 + Login.field854.drawAt(var33 - 109, var4); // L: 1394 + class29.field159.drawAt(var33 - 48, var4 + 18); // L: 1395 + } else if (Login.loginIndex == 12) { // L: 1397 + var33 = Login.loginBoxCenter; // L: 1398 + var34 = 216; // L: 1399 + var2.drawCentered("Before using this app, please read and accept our", var33, var34, 16777215, 0); // L: 1400 + var4 = var34 + 17; // L: 1401 + var2.drawCentered("terms of use, privacy policy, and end user licence", var33, var4, 16777215, 0); // L: 1402 + var4 += 17; // L: 1403 + var2.drawCentered("agreement (EULA).", var33, var4, 16777215, 0); // L: 1404 + var4 += 17; // L: 1405 + var2.drawCentered("By accepting, you agree to these documents.", var33, var4, 16777215, 0); // L: 1406 + var33 = Login.loginBoxCenter - 80; // L: 1407 + var34 = 311; // L: 1408 + Login.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1409 + var0.drawCentered("Accept", var33, var34 + 5, 16777215, 0); // L: 1410 + var33 = Login.loginBoxCenter + 80; // L: 1411 + Login.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1412 + var0.drawCentered("Decline", var33, var34 + 5, 16777215, 0); // L: 1413 + } else if (Login.loginIndex == 13) { // L: 1415 + var32 = 231; // L: 1416 + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var32, 16777215, 0); // L: 1417 + var33 = var32 + 20; // L: 1418 + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var33, 16777215, 0); // L: 1419 + var4 = Login.loginBoxX + 180; // L: 1420 + var32 = 311; // L: 1421 + Login.titlebuttonSprite.drawAt(var4 - 73, var32 - 20); // L: 1422 + var0.drawCentered("Back", var4, var32 + 5, 16777215, 0); // L: 1423 + } else if (Login.loginIndex == 14) { // L: 1425 + var32 = 201; // L: 1426 + String var24 = ""; // L: 1427 + var5 = ""; // L: 1428 + var6 = ""; // L: 1429 + switch(Login.field866) { // L: 1430 + case 0: + var24 = "Your account has been disabled."; // L: 1445 + var5 = Strings.field3501; // L: 1446 + var6 = ""; // L: 1447 + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1438 + var5 = Strings.field3446; // L: 1439 + var6 = ""; // L: 1440 + break; // L: 1441 + default: + class1.Login_promptCredentials(false); // L: 1433 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1451 + var33 = var32 + 15; // L: 1452 + var2.drawCentered(var5, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1453 + var33 += 15; // L: 1454 + var2.drawCentered(var6, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1455 + var33 += 15; // L: 1456 + var25 = Login.loginBoxX + 180; // L: 1457 + var36 = 276; // L: 1458 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1459 + var0.drawCentered("Support Page", var25, var36 + 5, 16777215, 0); // L: 1460 + var25 = Login.loginBoxX + 180; // L: 1461 + var36 = 326; // L: 1462 + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1463 + var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); // L: 1464 + } else if (Login.loginIndex == 24) { // L: 1466 + var32 = 221; // L: 1467 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1468 + var33 = var32 + 15; // L: 1469 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1470 + var33 += 15; // L: 1471 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1472 + var33 += 15; // L: 1473 + var4 = Login.loginBoxX + 180; // L: 1474 + var23 = 301; // L: 1475 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1476 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1477 + } + } + } + + if (Client.gameState >= 10) { // L: 1480 + int[] var26 = new int[4]; // L: 1481 + Rasterizer2D.Rasterizer2D_getClipArray(var26); // L: 1482 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, KeyHandler.canvasHeight); // L: 1483 + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1484 + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1485 + Rasterizer2D.Rasterizer2D_setClipArray(var26); // L: 1486 + } + + VarpDefinition.title_muteSprite[class408.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1488 + if (Client.gameState > 5 && Language.Language_EN == MouseHandler.clientLanguage) { // L: 1489 + if (field54 != null) { // L: 1490 + var33 = Login.xPadding + 5; // L: 1491 + var34 = 463; // L: 1492 + byte var46 = 100; // L: 1493 + byte var27 = 35; // L: 1494 + field54.drawAt(var33, var34); // L: 1495 + var0.drawCentered("World" + " " + Client.worldId, var46 / 2 + var33, var27 / 2 + var34 - 2, 16777215, 0); // L: 1496 + if (class21.World_request != null) { // L: 1497 + var1.drawCentered("Loading...", var46 / 2 + var33, var27 / 2 + var34 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var46 / 2 + var33, var27 / 2 + var34 + 12, 16777215, 0); // L: 1498 + } + } else { + field54 = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "sl_button", ""); // L: 1501 + } + } + + } + } // L: 1101 1504 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-2090753673" + ) + static int method171(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3710 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MusicPatch.loadWorlds() ? 1 : 0; // L: 3711 + return 1; // L: 3712 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3714 + var9 = class20.worldListStart(); // L: 3715 + if (var9 != null) { // L: 3716 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.id; // L: 3717 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.properties; // L: 3718 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.activity; // L: 3719 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.location; // L: 3720 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.population; // L: 3721 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.host; // L: 3722 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3725 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3726 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3727 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3728 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3729 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3730 + } + + return 1; // L: 3732 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3734 + var9 = class91.getNextWorldListWorld(); // L: 3735 + if (var9 != null) { // L: 3736 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.id; // L: 3737 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.properties; // L: 3738 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.activity; // L: 3739 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.location; // L: 3740 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.population; // L: 3741 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.host; // L: 3742 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3745 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3746 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3747 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3748 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3749 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3750 + } + + return 1; // L: 3752 } else { - throw new RuntimeException(); + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3754 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3755 + var7 = null; // L: 3756 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3757 + if (var3 == WorldMapEvent.World_worlds[var8].id) { // L: 3758 + var7 = WorldMapEvent.World_worlds[var8]; // L: 3759 + break; + } + } + + if (var7 != null) { // L: 3763 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.id; // L: 3764 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.properties; // L: 3765 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.activity; // L: 3766 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.location; // L: 3767 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.population; // L: 3768 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.host; // L: 3769 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3772 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3773 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3774 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3775 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3776 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3777 + } + + return 1; // L: 3779 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3781 + class14.Interpreter_intStackSize -= 4; // L: 3782 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3783 + boolean var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 3784 + var8 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3785 + boolean var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3] == 1; // L: 3786 + class11.sortWorldList(var3, var10, var8, var6); // L: 3787 + return 1; // L: 3788 + } else if (var0 != 6511) { // L: 3790 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3811 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 3812 + return 1; // L: 3813 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3815 + class14.Interpreter_intStackSize -= 2; // L: 3816 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3817 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3818 + var5 = Buffer.getParamDefinition(var4); // L: 3819 + if (var5.isString()) { // L: 3820 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ScriptFrame.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3821 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3824 + } + + return 1; // L: 3826 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3828 + class14.Interpreter_intStackSize -= 2; // L: 3829 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3830 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3831 + var5 = Buffer.getParamDefinition(var4); // L: 3832 + if (var5.isString()) { // L: 3833 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = KitDefinition.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3834 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KitDefinition.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3837 + } + + return 1; // L: 3839 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3841 + class14.Interpreter_intStackSize -= 2; // L: 3842 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3843 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3844 + var5 = Buffer.getParamDefinition(var4); // L: 3845 + if (var5.isString()) { // L: 3846 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = TaskHandler.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3847 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3850 + } + + return 1; // L: 3852 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3854 + class14.Interpreter_intStackSize -= 2; // L: 3855 + var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3856 + var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3857 + var5 = Buffer.getParamDefinition(var4); // L: 3858 + if (var5.isString()) { // L: 3859 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = class275.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3860 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class275.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3863 + } + + return 1; // L: 3865 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3867 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3868 + return 1; // L: 3869 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3871 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3872 + return 1; // L: 3873 + } else if (var0 == 6520) { // L: 3875 + return 1; // L: 3876 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3878 + return 1; // L: 3879 + } else if (var0 == 6522) { // L: 3881 + --class295.Interpreter_stringStackSize; // L: 3882 + --class14.Interpreter_intStackSize; // L: 3883 + return 1; // L: 3884 + } else if (var0 == 6523) { // L: 3886 + --class295.Interpreter_stringStackSize; // L: 3887 + --class14.Interpreter_intStackSize; // L: 3888 + return 1; // L: 3889 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3891 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3892 + return 1; // L: 3893 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3895 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 3896 + return 1; // L: 3897 + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3899 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 3900 + return 1; // L: 3901 + } else if (var0 == 6527) { // L: 3903 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field469; // L: 3904 + return 1; // L: 3905 + } else { + return 2; // L: 3907 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3791 + if (var3 >= 0 && var3 < World.World_count) { // L: 3792 + var7 = WorldMapEvent.World_worlds[var3]; // L: 3793 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.id; // L: 3794 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.properties; // L: 3795 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.activity; // L: 3796 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.location; // L: 3797 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.population; // L: 3798 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.host; // L: 3799 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3802 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3803 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3804 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3805 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3806 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3807 + } + + return 1; // L: 3809 + } } } } - @ObfuscatedName("fv") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1791069108" + descriptor = "(II)V", + garbageValue = "-1284893568" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "839045264" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - } - - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "19204" - ) - static boolean method159() { - return WorldMapDecorationType.clientPreferences.field1209 >= Client.field524; - } + static void method170(int var0) { + class274.tempMenuAction = new MenuAction(); // L: 11268 + class274.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11269 + class274.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11270 + class274.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11271 + class274.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11272 + class274.tempMenuAction.action = Client.menuActions[var0]; // L: 11273 + } // L: 11274 } diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index bcc6496407..0a82d4a26c 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -1,21 +1,30 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("di") public class class120 extends class116 { - @ObfuscatedName("so") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -346097947 + intValue = -81138609 ) - static int field1408; - @ObfuscatedName("l") + static int field1403; + @ObfuscatedName("k") + public static boolean field1401; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljf;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2132840675 + intValue = -1094018377 ) - int field1409; - @ObfuscatedName("q") - byte field1407; + int field1400; + @ObfuscatedName("w") + byte field1405; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -27,72 +36,25 @@ public class class120 extends class116 { ) class120(class119 var1) { this.this$0 = var1; - this.field1409 = -1; - } + this.field1400 = -1; // L: 128 + } // L: 131 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1409 = var1.readUnsignedShort(); - this.field1407 = var1.readByte(); - } + void vmethod2847(Buffer var1) { + this.field1400 = var1.readUnsignedShort(); // L: 134 + this.field1405 = var1.readByte(); // L: 135 + } // L: 136 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2619(this.field1409, this.field1407); - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1261296688" - ) - static void method2530() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = HealthBarUpdate.getWidget(var4); - if (var5 != null) { - class16.invalidateWidget(var5); - } - } - } - } - - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1468568304" - ) - static void method2533(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class321.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - class351.method6285(var0, var1); - } + void vmethod2848(ClanSettings var1) { + var1.method2673(this.field1400, this.field1405); // L: 139 + } // L: 140 } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java index 0dc3d4f229..b61fd96a5f 100644 --- a/runescape-client/src/main/java/class121.java +++ b/runescape-client/src/main/java/class121.java @@ -1,35 +1,36 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("di") +@ObfuscatedName("do") public class class121 extends class116 { + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = -1196916291 + ) + @Export("cameraPitch") + static int cameraPitch; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1714829299 + intValue = 1717605109 ) - static int field1412; - @ObfuscatedName("l") + int field1412; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -501523109 + intValue = -1452092031 ) - int field1416; - @ObfuscatedName("q") + int field1408; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -22670281 + intValue = 513208975 ) - int field1413; - @ObfuscatedName("f") + int field1409; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 826571971 + intValue = 479707565 ) - int field1414; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1587777273 - ) - int field1415; + int field1407; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -40,113 +41,27 @@ public class class121 extends class116 { descriptor = "(Ldg;)V" ) class121(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 289 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1416 = var1.readInt(); - this.field1415 = var1.readInt(); - this.field1413 = var1.readUnsignedByte(); - this.field1414 = var1.readUnsignedByte(); - } + void vmethod2847(Buffer var1) { + this.field1412 = var1.readInt(); // L: 292 + this.field1407 = var1.readInt(); // L: 293 + this.field1408 = var1.readUnsignedByte(); // L: 294 + this.field1409 = var1.readUnsignedByte(); // L: 295 + } // L: 296 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2598(this.field1416, this.field1415, this.field1413, this.field1414); - } - - @ObfuscatedName("l") - public static final void method2542(long var0) { - if (var0 > 0L) { - if (0L == var0 % 10L) { - long var2 = var0 - 1L; - - try { - Thread.sleep(var2); - } catch (InterruptedException var8) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { - } - } else { - try { - Thread.sleep(var0); - } catch (InterruptedException var6) { - } - } - - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1097941230" - ) - static int method2541(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = HealthBarUpdate.getWidget(var3); - } else { - var4 = var2 ? WorldMapDecoration.scriptDotWidget : class245.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - class16.invalidateWidget(var4); - class21.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - class16.invalidateWidget(var4); - class21.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - class16.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } - } + void vmethod2848(ClanSettings var1) { + var1.method2665(this.field1412, this.field1407, this.field1408, this.field1409); // L: 299 + } // L: 300 } diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index f3db5b4b2d..eb44cb347c 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -1,426 +1,127 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dw") +@ObfuscatedName("dr") public class class122 extends class132 { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1596107061 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lar;" ) - static int field1426; - @ObfuscatedName("l") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = -308201513 + intValue = 203381115 ) - int field1427; - @ObfuscatedName("q") - byte field1424; - @ObfuscatedName("f") + static int field1420; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -519402687 + intValue = 1422927589 ) - int field1423; - @ObfuscatedName("j") - String field1425; + int field1419; + @ObfuscatedName("w") + byte field1415; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1058551231 + ) + int field1417; + @ObfuscatedName("a") + String field1414; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Leh;" ) final class133 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Leh;)V" ) class122(class133 var1) { this.this$0 = var1; - this.field1427 = -1; - } + this.field1419 = -1; // L: 101 + } // L: 106 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - void vmethod2760(Buffer var1) { - this.field1427 = var1.readUnsignedShort(); - this.field1424 = var1.readByte(); - this.field1423 = var1.readUnsignedShort(); - var1.readLong(); - this.field1425 = var1.readStringCp1252NullTerminated(); - } + void vmethod2839(Buffer var1) { + this.field1419 = var1.readUnsignedShort(); // L: 109 + this.field1415 = var1.readByte(); // L: 110 + this.field1417 = var1.readUnsignedShort(); // L: 111 + var1.readLong(); // L: 112 + this.field1414 = var1.readStringCp1252NullTerminated(); // L: 113 + } // L: 114 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" ) - void vmethod2759(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1427); - var2.rank = this.field1424; - var2.world = this.field1423; - var2.username = new Username(this.field1425); - } + void vmethod2838(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1419); // L: 117 + var2.rank = this.field1415; // L: 118 + var2.world = this.field1417; // L: 119 + var2.username = new Username(this.field1414); // L: 120 + } // L: 121 - @ObfuscatedName("ab") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "1077786730" + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "904949583" ) - static int method2549(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (Message.friendSystem.field798 == 0) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -2; - } else if (Message.friendSystem.field798 == 1) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Message.friendSystem.friendsList.getSize(); + public static void method2599(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 47 + int var4 = (var3 + var2) / 2; // L: 48 + int var5 = var2; // L: 49 + String var6 = var0[var4]; // L: 50 + var0[var4] = var0[var3]; // L: 51 + var0[var3] = var6; // L: 52 + int var7 = var1[var4]; // L: 53 + var1[var4] = var1[var3]; // L: 54 + var1[var3] = var7; // L: 55 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 56 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 57 + String var9 = var0[var8]; // L: 58 + var0[var8] = var0[var5]; // L: 59 + var0[var5] = var9; // L: 60 + int var10 = var1[var8]; // L: 61 + var1[var8] = var1[var5]; // L: 62 + var1[var5++] = var10; // L: 63 + } } - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Message.friendSystem.method1650() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)Message.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Message.friendSystem.method1650() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Message.friendSystem.method1650() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - class16.method207(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Message.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Message.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Message.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - Message.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var5 = class351.method6286(var5); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Message.friendSystem.isFriended(new Username(var5, WorldMapSectionType.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (class264.friendsChat != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class264.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (class264.friendsChat != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class264.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class264.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((Buddy)class264.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = ((Buddy)class264.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class264.friendsChat != null ? class264.friendsChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - SoundSystem.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class264.friendsChat != null ? class264.friendsChat.rank * 1806063027 * 653549947 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - class12.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - GrandExchangeOfferTotalQuantityComparator.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!Message.friendSystem.method1650()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Message.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Message.friendSystem.method1650() && var3 >= 0 && var3 < Message.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)Message.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class54.Interpreter_stringStackSize]; - var5 = class351.method6286(var5); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Message.friendSystem.isIgnored(new Username(var5, WorldMapSectionType.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize() && class264.friendsChat.get(var3).getUsername().equals(class67.localPlayer.username)) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (class264.friendsChat != null && class264.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class264.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize() && ((ClanMate)class264.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - Message.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - Message.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - Message.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - Message.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (class264.friendsChat != null) { - class264.friendsChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (class264.friendsChat != null) { - class264.friendsChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class264.friendsChat != null) { - class264.friendsChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (class264.friendsChat != null && var3 < class264.friendsChat.getSize() && ((ClanMate)class264.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } + var0[var3] = var0[var5]; // L: 67 + var0[var5] = var6; // L: 68 + var1[var3] = var1[var5]; // L: 69 + var1[var5] = var7; // L: 70 + method2599(var0, var1, var2, var5 - 1); // L: 71 + method2599(var0, var1, var5 + 1, var3); // L: 72 } + + } // L: 74 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lbf;", + garbageValue = "622139393" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 44 + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-47" + ) + static boolean method2607(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9312 } } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index e98fd6fe50..8fb04b45af 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -1,18 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dn") +@ObfuscatedName("dz") public class class123 extends class116 { - @ObfuscatedName("l") - boolean field1433; - @ObfuscatedName("q") - byte field1429; - @ObfuscatedName("f") - byte field1432; - @ObfuscatedName("j") - byte field1431; - @ObfuscatedName("m") - byte field1428; + @ObfuscatedName("i") + boolean field1424; + @ObfuscatedName("w") + byte field1422; + @ObfuscatedName("s") + byte field1423; + @ObfuscatedName("a") + byte field1421; + @ObfuscatedName("o") + byte field1425; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -23,32 +24,306 @@ public class class123 extends class116 { descriptor = "(Ldg;)V" ) class123(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 248 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1433 = var1.readUnsignedByte() == 1; - this.field1429 = var1.readByte(); - this.field1432 = var1.readByte(); - this.field1431 = var1.readByte(); - this.field1428 = var1.readByte(); + void vmethod2847(Buffer var1) { + this.field1424 = var1.readUnsignedByte() == 1; // L: 251 + this.field1422 = var1.readByte(); // L: 252 + this.field1423 = var1.readByte(); // L: 253 + this.field1421 = var1.readByte(); // L: 254 + this.field1425 = var1.readByte(); // L: 255 + } // L: 256 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" + ) + void vmethod2848(ClanSettings var1) { + var1.allowGuests = this.field1424; // L: 259 + var1.field1444 = this.field1422; // L: 260 + var1.field1439 = this.field1423; // L: 261 + var1.field1446 = this.field1421; // L: 262 + var1.field1447 = this.field1425; // L: 263 + } // L: 264 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-776812615" + ) + public static boolean method2614(int var0) { + return var0 == WorldMapDecorationType.field3244.id; // L: 42 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(III)V", + garbageValue = "1761833612" ) - void vmethod2766(ClanSettings var1) { - var1.allowGuests = this.field1433; - var1.field1450 = this.field1429; - var1.field1452 = this.field1432; - var1.field1459 = this.field1431; - var1.field1466 = this.field1428; + public static void method2616(int var0, int var1) { + VarbitComposition var2 = class150.method2965(var0); // L: 33 + int var3 = var2.baseVar; // L: 34 + int var4 = var2.startBit; + int var5 = var2.endBit; // L: 36 + int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 + if (var1 < 0 || var1 > var6) { // L: 38 + var1 = 0; + } + + var6 <<= var4; // L: 39 + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 + } // L: 41 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "988322952" + ) + public static int method2619(int var0) { + return class245.field2908[var0]; // L: 35 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "2087887808" + ) + static int method2618(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1825 + class14.Interpreter_intStackSize -= 3; // L: 1826 + class128.queueSoundEffect(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]); // L: 1827 + return 1; // L: 1828 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1830 + ModeWhere.playSong(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1831 + return 1; // L: 1832 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1834 + class14.Interpreter_intStackSize -= 2; // L: 1835 + Friend.method6057(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 1836 + return 1; // L: 1837 + } else { + int var3; + int var4; + if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1839 + if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 1875 + return var0 == 3211 ? 1 : 2; // L: 1909 1910 1912 + } else { + var3 = 0; // L: 1876 + var4 = 0; // L: 1877 + if (var0 == 3210) { // L: 1878 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1879 + } else if (var0 == 3182) { // L: 1881 + var3 = 6; // L: 1882 + } else if (var0 == 3204) { // L: 1884 + var3 = 7; // L: 1885 + } else if (var0 == 3206) { // L: 1887 + var3 = 8; // L: 1888 + } else if (var0 == 3208) { // L: 1890 + var3 = 9; // L: 1891 + } + + if (var3 == 6) { // L: 1893 + float var5 = 200.0F * ((float)class408.clientPreferences.brightness - 0.5F); // L: 1894 + var4 = 100 - Math.round(var5); // L: 1895 + } else if (var3 == 7) { // L: 1897 + var4 = Math.round((float)class408.clientPreferences.musicVolume / 2.55F); // L: 1898 + } else if (var3 == 8) { // L: 1900 + var4 = Math.round((float)class408.clientPreferences.soundEffectsVolume / 1.27F); // L: 1901 + } else if (var3 == 9) { // L: 1903 + var4 = Math.round((float)class408.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1904 + } + + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4; // L: 1906 + return 1; // L: 1907 + } + } else { + var3 = 0; // L: 1840 + var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1841 + if (var0 == 3209) { // L: 1842 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1843 + } else if (var0 == 3181) { // L: 1845 + var3 = 6; // L: 1846 + } else if (var0 == 3203) { // L: 1848 + var3 = 7; // L: 1849 + } else if (var0 == 3205) { // L: 1851 + var3 = 8; // L: 1852 + } else if (var0 == 3207) { // L: 1854 + var3 = 9; // L: 1855 + } + + if (var3 == 6) { // L: 1857 + var4 = 100 - Math.min(Math.max(var4, 0), 100); // L: 1858 + class354.method6396((double)(0.5F + (float)var4 / 200.0F)); // L: 1859 + } else if (var3 == 7) { // L: 1861 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1862 + class14.method178(Math.round(2.55F * (float)var4)); // L: 1863 + } else if (var3 == 8) { // L: 1865 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1866 + WorldMapSection1.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); // L: 1867 + } else if (var3 == 9) { // L: 1869 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1870 + ClanChannel.method2825(Math.round((float)var4 * 1.27F)); // L: 1871 + } + + return 1; // L: 1873 + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "1954387020" + ) + static int method2608(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4277 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4282 + if (var0 == 6750) { // L: 4286 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4287 + return 1; // L: 4288 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4290 + if (var0 == 6754) { // L: 4294 + int var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4295 + NPCComposition var4 = ScriptFrame.getNpcDefinition(var3); // L: 4296 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4297 + return 1; // L: 4298 + } else { + return 2; // L: 4300 + } + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4291 + return 1; // L: 4292 + } + } else { + --class14.Interpreter_intStackSize; // L: 4283 + return 1; // L: 4284 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 4278 + --class295.Interpreter_stringStackSize; // L: 4279 + return 1; // L: 4280 + } + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-980124614" + ) + static final void method2621() { + int var0 = SpotAnimationDefinition.field1761 * 128 + 64; // L: 4180 + int var1 = BuddyRankComparator.field1333 * 128 + 64; // L: 4181 + int var2 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - Renderable.field2442; // L: 4182 + if (WorldMapSectionType.cameraX < var0) { // L: 4183 + WorldMapSectionType.cameraX = (var0 - WorldMapSectionType.cameraX) * Login.field888 / 1000 + WorldMapSectionType.cameraX + UserComparator8.field1305; // L: 4184 + if (WorldMapSectionType.cameraX > var0) { // L: 4185 + WorldMapSectionType.cameraX = var0; + } + } + + if (WorldMapSectionType.cameraX > var0) { // L: 4187 + WorldMapSectionType.cameraX -= Login.field888 * (WorldMapSectionType.cameraX - var0) / 1000 + UserComparator8.field1305; // L: 4188 + if (WorldMapSectionType.cameraX < var0) { // L: 4189 + WorldMapSectionType.cameraX = var0; + } + } + + if (class174.cameraY < var2) { // L: 4191 + class174.cameraY = (var2 - class174.cameraY) * Login.field888 / 1000 + class174.cameraY + UserComparator8.field1305; // L: 4192 + if (class174.cameraY > var2) { // L: 4193 + class174.cameraY = var2; + } + } + + if (class174.cameraY > var2) { // L: 4195 + class174.cameraY -= Login.field888 * (class174.cameraY - var2) / 1000 + UserComparator8.field1305; // L: 4196 + if (class174.cameraY < var2) { // L: 4197 + class174.cameraY = var2; + } + } + + if (class65.cameraZ < var1) { // L: 4199 + class65.cameraZ = (var1 - class65.cameraZ) * Login.field888 / 1000 + class65.cameraZ + UserComparator8.field1305; // L: 4200 + if (class65.cameraZ > var1) { // L: 4201 + class65.cameraZ = var1; + } + } + + if (class65.cameraZ > var1) { // L: 4203 + class65.cameraZ -= Login.field888 * (class65.cameraZ - var1) / 1000 + UserComparator8.field1305; // L: 4204 + if (class65.cameraZ < var1) { // L: 4205 + class65.cameraZ = var1; + } + } + + var0 = UrlRequest.field1298 * 128 + 64; // L: 4207 + var1 = SoundSystem.field288 * 128 + 64; // L: 4208 + var2 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - ArchiveLoader.field985; // L: 4209 + int var3 = var0 - WorldMapSectionType.cameraX; // L: 4210 + int var4 = var2 - class174.cameraY; // L: 4211 + int var5 = var1 - class65.cameraZ; // L: 4212 + int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 4213 + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; // L: 4214 + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; // L: 4215 + if (var7 < 128) { // L: 4216 + var7 = 128; + } + + if (var7 > 383) { // L: 4217 + var7 = 383; + } + + if (class121.cameraPitch < var7) { // L: 4218 + class121.cameraPitch = (var7 - class121.cameraPitch) * TextureProvider.field2484 / 1000 + class121.cameraPitch + class269.field3221; // L: 4219 + if (class121.cameraPitch > var7) { // L: 4220 + class121.cameraPitch = var7; + } + } + + if (class121.cameraPitch > var7) { // L: 4222 + class121.cameraPitch -= TextureProvider.field2484 * (class121.cameraPitch - var7) / 1000 + class269.field3221; // L: 4223 + if (class121.cameraPitch < var7) { // L: 4224 + class121.cameraPitch = var7; + } + } + + int var9 = var8 - WorldMapRegion.cameraYaw; // L: 4226 + if (var9 > 1024) { // L: 4227 + var9 -= 2048; + } + + if (var9 < -1024) { // L: 4228 + var9 += 2048; + } + + if (var9 > 0) { // L: 4229 + WorldMapRegion.cameraYaw = var9 * TextureProvider.field2484 / 1000 + WorldMapRegion.cameraYaw + class269.field3221; // L: 4230 + WorldMapRegion.cameraYaw &= 2047; // L: 4231 + } + + if (var9 < 0) { // L: 4233 + WorldMapRegion.cameraYaw -= -var9 * TextureProvider.field2484 / 1000 + class269.field3221; // L: 4234 + WorldMapRegion.cameraYaw &= 2047; // L: 4235 + } + + int var10 = var8 - WorldMapRegion.cameraYaw; // L: 4237 + if (var10 > 1024) { // L: 4238 + var10 -= 2048; + } + + if (var10 < -1024) { // L: 4239 + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { // L: 4240 + WorldMapRegion.cameraYaw = var8; + } + + } // L: 4241 } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index ea2d94492d..5913693442 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -1,236 +1,49 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("dx") public class class124 extends class132 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -336591423 + intValue = -443066263 ) - int field1434; + int field1426; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Leh;" ) final class133 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Leh;)V" ) class124(class133 var1) { this.this$0 = var1; - this.field1434 = -1; - } + this.field1426 = -1; // L: 82 + } // L: 84 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - void vmethod2760(Buffer var1) { - this.field1434 = var1.readUnsignedShort(); - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); + void vmethod2839(Buffer var1) { + this.field1426 = var1.readUnsignedShort(); // L: 87 + var1.readUnsignedByte(); // L: 88 + if (var1.readUnsignedByte() != 255) { // L: 89 + --var1.offset; // L: 90 + var1.readLong(); // L: 91 } - } + } // L: 93 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" ) - void vmethod2759(ClanChannel var1) { - var1.removeMember(this.field1434); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;IZB)Lht;", - garbageValue = "40" - ) - public static Frames method2560(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); - - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); - } - - if (var9 == null) { - var4 = false; - } - } - } - - if (!var4) { - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; - } - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "287619330" - ) - static int method2564(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return FloorDecoration.method4104(var0, var1, var2); - } else if (var0 < 1100) { - return class121.method2541(var0, var1, var2); - } else if (var0 < 1200) { - return FontName.method6619(var0, var1, var2); - } else if (var0 < 1300) { - return class113.method2482(var0, var1, var2); - } else if (var0 < 1400) { - return Language.method5478(var0, var1, var2); - } else if (var0 < 1500) { - return PcmPlayer.method697(var0, var1, var2); - } else if (var0 < 1600) { - return MidiPcmStream.method4814(var0, var1, var2); - } else if (var0 < 1700) { - return Bounds.method6262(var0, var1, var2); - } else if (var0 < 1800) { - return LoginPacket.method4659(var0, var1, var2); - } else if (var0 < 1900) { - return UserComparator10.method2451(var0, var1, var2); - } else if (var0 < 2000) { - return WorldMapSprite.method3866(var0, var1, var2); - } else if (var0 < 2100) { - return class121.method2541(var0, var1, var2); - } else if (var0 < 2200) { - return FontName.method6619(var0, var1, var2); - } else if (var0 < 2300) { - return class113.method2482(var0, var1, var2); - } else if (var0 < 2400) { - return Language.method5478(var0, var1, var2); - } else if (var0 < 2500) { - return PcmPlayer.method697(var0, var1, var2); - } else if (var0 < 2600) { - return class19.method299(var0, var1, var2); - } else if (var0 < 2700) { - return ChatChannel.method1987(var0, var1, var2); - } else if (var0 < 2800) { - return class279.method5136(var0, var1, var2); - } else if (var0 < 2900) { - return NetFileRequest.method5215(var0, var1, var2); - } else if (var0 < 3000) { - return WorldMapSprite.method3866(var0, var1, var2); - } else if (var0 < 3200) { - return SoundCache.method780(var0, var1, var2); - } else if (var0 < 3300) { - return ScriptEvent.method2066(var0, var1, var2); - } else if (var0 < 3400) { - return ApproximateRouteStrategy.method1095(var0, var1, var2); - } else if (var0 < 3500) { - return class329.method5931(var0, var1, var2); - } else if (var0 < 3600) { - return Interpreter.method1868(var0, var1, var2); - } else if (var0 < 3700) { - return class122.method2549(var0, var1, var2); - } else if (var0 < 3800) { - return UserComparator3.method2436(var0, var1, var2); - } else if (var0 < 3900) { - return WorldMapSection0.method3826(var0, var1, var2); - } else if (var0 < 4000) { - return class262.method5063(var0, var1, var2); - } else if (var0 < 4100) { - return SecureRandomCallable.method2026(var0, var1, var2); - } else if (var0 < 4200) { - return WorldMapSection0.method3827(var0, var1, var2); - } else if (var0 < 4300) { - return UserComparator4.method2399(var0, var1, var2); - } else if (var0 < 5100) { - return LoginPacket.method4660(var0, var1, var2); - } else if (var0 < 5400) { - return AbstractWorldMapIcon.method3945(var0, var1, var2); - } else if (var0 < 5600) { - return PlayerType.method5153(var0, var1, var2); - } else if (var0 < 5700) { - return ParamComposition.method3129(var0, var1, var2); - } else if (var0 < 6300) { - return class264.method5071(var0, var1, var2); - } else if (var0 < 6600) { - return class176.method3442(var0, var1, var2); - } else if (var0 < 6700) { - return Renderable.method4394(var0, var1, var2); - } else if (var0 < 6800) { - return HealthBar.method2220(var0, var1, var2); - } else if (var0 < 6900) { - return WallDecoration.method4581(var0, var1, var2); - } else if (var0 < 7000) { - return class130.method2683(var0, var1, var2); - } else if (var0 < 7100) { - return ObjectSound.method1730(var0, var1, var2); - } else if (var0 < 7200) { - return class262.method5062(var0, var1, var2); - } else { - return var0 < 7300 ? ReflectionCheck.method1063(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1215104265" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1119903328" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = MidiPcmStream.getTileHeight(var0, var1, VertexNormal.Client_plane) - var2; - var0 -= Canvas.cameraX; - var3 -= class14.cameraY; - var1 -= VarpDefinition.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon_1.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon_1.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[HealthBarUpdate.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[HealthBarUpdate.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var4 * var3 + var5 * var1 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } - - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } - } + void vmethod2838(ClanChannel var1) { + var1.removeMember(this.field1426); // L: 96 + } // L: 97 } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index a97c9d46cb..6388137af1 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -1,11 +1,10 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("dd") public class class125 extends class116 { - @ObfuscatedName("l") - String field1438; + @ObfuscatedName("i") + String field1429; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -16,35 +15,70 @@ public class class125 extends class116 { descriptor = "(Ldg;)V" ) class125(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 229 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1438 = var1.readStringCp1252NullTerminated(); - var1.readInt(); - } + void vmethod2847(Buffer var1) { + this.field1429 = var1.readStringCp1252NullTerminated(); // L: 232 + var1.readInt(); // L: 233 + } // L: 234 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.name = this.field1438; - } + void vmethod2848(ClanSettings var1) { + var1.name = this.field1429; // L: 237 + } // L: 238 - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)[Lob;", - garbageValue = "1776843311" + descriptor = "(I)V", + garbageValue = "-924468253" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.SOLID, FillMode.field4368, FillMode.field4366}; - } + public static void method2637() { + class54.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIILfe;II)V", + garbageValue = "2132581539" + ) + static void method2635(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); // L: 59 + var5.plane = var0; // L: 60 + var5.x = var1 * 128; // L: 61 + var5.y = var2 * 128; // L: 62 + int var6 = var3.sizeX; // L: 63 + int var7 = var3.sizeY; // L: 64 + if (var4 == 1 || var4 == 3) { // L: 65 + var6 = var3.sizeY; // L: 66 + var7 = var3.sizeX; // L: 67 + } + + var5.field771 = (var6 + var1) * 128; // L: 69 + var5.field772 = (var7 + var2) * 128; // L: 70 + var5.soundEffectId = var3.ambientSoundId; // L: 71 + var5.field773 = var3.int7 * 128; // L: 72 + var5.field767 = var3.int5; // L: 73 + var5.field776 = var3.int6; // L: 74 + var5.soundEffectIds = var3.soundEffectIds; // L: 75 + if (var3.transforms != null) { // L: 76 + var5.obj = var3; // L: 77 + var5.set(); // L: 78 + } + + ObjectSound.objectSounds.addFirst(var5); // L: 80 + if (var5.soundEffectIds != null) { // L: 81 + var5.field779 = var5.field767 + (int)(Math.random() * (double)(var5.field776 - var5.field767)); + } + + } // L: 82 } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index c5d8fdd568..4fd9b74b50 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,26 +1,16 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("dl") public class class126 extends class116 { - @ObfuscatedName("rq") - @ObfuscatedSignature( - descriptor = "Laq;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -715291481 + intValue = 1462518915 ) - int field1440; - @ObfuscatedName("q") - String field1439; + int field1433; + @ObfuscatedName("w") + String field1432; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -31,80 +21,37 @@ public class class126 extends class116 { descriptor = "(Ldg;)V" ) class126(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 323 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1440 = var1.readInt(); - this.field1439 = var1.readStringCp1252NullTerminated(); - } + void vmethod2847(Buffer var1) { + this.field1433 = var1.readInt(); // L: 326 + this.field1432 = var1.readStringCp1252NullTerminated(); // L: 327 + } // L: 328 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2614(this.field1440, this.field1439); - } + void vmethod2848(ClanSettings var1) { + var1.method2667(this.field1433, this.field1432); // L: 331 + } // L: 332 - @ObfuscatedName("l") + @ObfuscatedName("lh") @ObfuscatedSignature( - descriptor = "(II)Lff;", - garbageValue = "541263159" + descriptor = "(B)V", + garbageValue = "-19" ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = DevicePcmPlayerProvider.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", - garbageValue = "-60" - ) - static void method2580(String var0, boolean var1, String var2, boolean var3) { - if (var1) { - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var5) { - } - } - - if (class29.field165.startsWith("win") && !var3) { - class139.method2763(var0, 0, "openjs"); - return; - } - - if (class29.field165.startsWith("mac")) { - class139.method2763(var0, 1, var2); - return; - } - - class139.method2763(var0, 2, "openjs"); - } else { - class139.method2763(var0, 3, "openjs"); + static void method2646() { + if (Client.oculusOrbState == 1) { // L: 12021 + Client.field511 = true; // L: 12022 } - } + } // L: 12024 } diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java index 03cfe9f226..e1006aa2dc 100644 --- a/runescape-client/src/main/java/class128.java +++ b/runescape-client/src/main/java/class128.java @@ -3,107 +3,164 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("dk") public class class128 extends class132 { - @ObfuscatedName("l") - String field1474; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1306318707 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lko;" ) - int field1471; - @ObfuscatedName("f") - byte field1472; + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("i") + String field1469; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -2112736833 + ) + int field1467; + @ObfuscatedName("s") + byte field1468; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Leh;" ) final class133 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Leh;)V" ) class128(class133 var1) { this.this$0 = var1; - this.field1474 = null; - } + this.field1469 = null; // L: 55 + } // L: 59 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - void vmethod2760(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); + void vmethod2839(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 62 + --var1.offset; // L: 63 + var1.readLong(); // L: 64 } - this.field1474 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1471 = var1.readUnsignedShort(); - this.field1472 = var1.readByte(); - var1.readLong(); + this.field1469 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 + this.field1467 = var1.readUnsignedShort(); // L: 67 + this.field1468 = var1.readByte(); // L: 68 + var1.readLong(); // L: 69 + } // L: 70 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" + ) + void vmethod2838(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); // L: 73 + var2.username = new Username(this.field1469); // L: 74 + var2.world = this.field1467; // L: 75 + var2.rank = this.field1468; // L: 76 + var1.addMember(var2); // L: 77 + } // L: 78 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)[Lia;", + garbageValue = "0" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2796, ServerPacket.field2874, ServerPacket.field2863, ServerPacket.field2865, ServerPacket.field2821, ServerPacket.field2797, ServerPacket.field2798, ServerPacket.field2799, ServerPacket.field2853, ServerPacket.field2801, ServerPacket.field2802, ServerPacket.field2803, ServerPacket.field2804, ServerPacket.field2805, ServerPacket.field2870, ServerPacket.field2807, ServerPacket.field2808, ServerPacket.field2809, ServerPacket.field2810, ServerPacket.field2855, ServerPacket.field2812, ServerPacket.field2813, ServerPacket.field2814, ServerPacket.field2815, ServerPacket.field2878, ServerPacket.field2817, ServerPacket.field2818, ServerPacket.field2852, ServerPacket.field2820, ServerPacket.field2831, ServerPacket.field2822, ServerPacket.field2823, ServerPacket.field2824, ServerPacket.field2825, ServerPacket.field2826, ServerPacket.field2827, ServerPacket.field2828, ServerPacket.field2829, ServerPacket.field2830, ServerPacket.field2887, ServerPacket.field2880, ServerPacket.field2833, ServerPacket.field2834, ServerPacket.field2835, ServerPacket.field2836, ServerPacket.field2837, ServerPacket.field2838, ServerPacket.field2839, ServerPacket.field2840, ServerPacket.field2841, ServerPacket.field2842, ServerPacket.field2843, ServerPacket.field2844, ServerPacket.field2845, ServerPacket.field2846, ServerPacket.field2800, ServerPacket.field2885, ServerPacket.field2849, ServerPacket.field2850, ServerPacket.field2811, ServerPacket.field2793, ServerPacket.field2847, ServerPacket.field2795, ServerPacket.field2859, ServerPacket.field2856, ServerPacket.field2857, ServerPacket.field2858, ServerPacket.field2806, ServerPacket.field2860, ServerPacket.field2861, ServerPacket.field2872, ServerPacket.field2877, ServerPacket.field2864, ServerPacket.field2851, ServerPacket.field2832, ServerPacket.field2867, ServerPacket.field2868, ServerPacket.field2869, ServerPacket.field2819, ServerPacket.field2871, ServerPacket.field2792, ServerPacket.field2873, ServerPacket.field2890, ServerPacket.field2862, ServerPacket.field2876, ServerPacket.field2875, ServerPacket.field2816, ServerPacket.field2879, ServerPacket.field2882, ServerPacket.field2881, ServerPacket.field2794, ServerPacket.field2883, ServerPacket.field2884, ServerPacket.field2886, ServerPacket.field2854, ServerPacket.field2892, ServerPacket.field2888}; // L: 106 } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lko;Lko;Lko;Lko;B)V", + garbageValue = "-43" ) - void vmethod2759(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1474); - var2.world = this.field1471; - var2.rank = this.field1472; - var1.addMember(var2); - } + public static void method2720(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + class283.Widget_archive = var0; // L: 190 + Widget.Widget_modelsArchive = var1; // L: 191 + WorldMapScaleHandler.Widget_spritesArchive = var2; // L: 192 + class134.Widget_fontsArchive = var3; // L: 193 + WorldMapSection1.Widget_interfaceComponents = new Widget[class283.Widget_archive.getGroupCount()][]; // L: 194 + class132.Widget_loadedInterfaces = new boolean[class283.Widget_archive.getGroupCount()]; // L: 195 + } // L: 196 - @ObfuscatedName("l") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "([Lku;IB)Lku;", - garbageValue = "13" + descriptor = "(IIIB)V", + garbageValue = "-63" ) - @Export("findEnumerated") - public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - MouseWheel var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class408.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 4067 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 4068 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 4069 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 4070 + Client.soundEffects[Client.soundEffectCount] = null; // L: 4071 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 4072 + ++Client.soundEffectCount; // L: 4073 } - return null; - } + } // L: 4075 - @ObfuscatedName("l") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;I)V", - garbageValue = "414172214" + descriptor = "(Ljf;I)Z", + garbageValue = "-636935524" ) - public static void method2662(AbstractArchive var0, AbstractArchive var1) { - GrandExchangeOfferAgeComparator.NpcDefinition_archive = var0; - NPCComposition.NpcDefinition_modelArchive = var1; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-236760725" - ) - static final int method2663(int var0, int var1) { - if (var0 == -1) { - return 12345678; + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10349 + return false; } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10350 + int var2 = class113.method2532(var0, var1); // L: 10351 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10352 + if (var0.cs1Comparisons[var1] == 2) { // L: 10353 + if (var2 >= var3) { // L: 10354 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10356 + if (var2 <= var3) { // L: 10357 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10359 + if (var3 == var2) { // L: 10360 + return false; + } + } else if (var3 != var2) { // L: 10362 + return false; + } } - return (var0 & 65408) + var1; + return true; // L: 10364 } } + + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1742538155" + ) + static void method2728(String var0) { + UserComparator3.field1316 = var0; // L: 11938 + + try { + String var1 = ArchiveLoader.client.getParameter(Integer.toString(18)); // L: 11940 + String var2 = ArchiveLoader.client.getParameter(Integer.toString(13)); // L: 11941 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11942 + if (var0.length() == 0) { // L: 11943 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + HorizontalAlignment.method3113(class111.method2516() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11944 + } + + class27.method393(ArchiveLoader.client, "document.cookie=\"" + var3 + "\""); // L: 11945 + } catch (Throwable var4) { // L: 11947 + } + + } // L: 11948 } diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index 5b58c9693f..5f55738dc4 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -3,316 +3,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dv") public class class129 extends class132 { - @ObfuscatedName("hi") - @Export("regions") - static int[] regions; - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1525021319 + intValue = 901521841 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1147127109 ) int field1480; - @ObfuscatedName("q") - byte field1476; - @ObfuscatedName("f") + @ObfuscatedName("w") + byte field1477; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1440007301 + intValue = -1543465901 ) - int field1481; - @ObfuscatedName("j") - String field1478; + int field1475; + @ObfuscatedName("a") + String field1476; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Leh;" ) final class133 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Leh;)V" ) class129(class133 var1) { this.this$0 = var1; - this.field1480 = -1; - } + this.field1480 = -1; // L: 125 + } // L: 130 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - void vmethod2760(Buffer var1) { - var1.readUnsignedByte(); - this.field1480 = var1.readUnsignedShort(); - this.field1476 = var1.readByte(); - this.field1481 = var1.readUnsignedShort(); - var1.readLong(); - this.field1478 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - } + void vmethod2839(Buffer var1) { + var1.readUnsignedByte(); // L: 133 + this.field1480 = var1.readUnsignedShort(); // L: 134 + this.field1477 = var1.readByte(); // L: 135 + this.field1475 = var1.readUnsignedShort(); // L: 136 + var1.readLong(); // L: 137 + this.field1476 = var1.readStringCp1252NullTerminated(); // L: 138 + var1.readUnsignedByte(); // L: 139 + } // L: 140 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" ) - void vmethod2759(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1480); - var2.rank = this.field1476; - var2.world = this.field1481; - var2.username = new Username(this.field1478); - } + void vmethod2838(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1480); // L: 143 + var2.rank = this.field1477; // L: 144 + var2.world = this.field1475; // L: 145 + var2.username = new Username(this.field1476); // L: 146 + } // L: 147 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIILfw;Lfy;I)Z", - garbageValue = "-1980971747" + descriptor = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "-28" ) - public static final boolean method2673(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; - int var6 = var1; - byte var7 = 64; - byte var8 = 64; - int var9 = var0 - var7; - int var10 = var1 - var8; - class174.directions[var7][var8] = 99; - class174.distances[var7][var8] = 0; - byte var11 = 0; - int var12 = 0; - class174.bufferX[var11] = var0; - int var20 = var11 + 1; - class174.bufferY[var11] = var1; - int[][] var13 = var4.flags; + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + boolean var2 = false; // L: 37 + boolean var3 = false; // L: 38 + int var4 = 0; // L: 39 + int var5 = var0.length(); // L: 40 + int var6 = 0; + boolean var1; while (true) { - label305: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label282: - do { - if (var20 == var12) { - class318.field3870 = var5; - class174.field1994 = var6; - return false; - } + if (var6 >= var5) { + var1 = var3; // L: 70 + break; + } - var5 = class174.bufferX[var12]; - var6 = class174.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)) { - class318.field3870 = var5; - class174.field1994 = var6; - return true; - } + label85: { + char var7 = var0.charAt(var6); // L: 42 + if (var6 == 0) { // L: 43 + if (var7 == '-') { // L: 44 + var2 = true; // L: 45 + break label85; + } - var16 = class174.distances[var18][var19] + 1; - if (var18 > 0 && class174.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) { - class174.bufferX[var20] = var5 - 1; - class174.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class174.directions[var18 - 1][var19] = 2; - class174.distances[var18 - 1][var19] = var16; - break; - } - - if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && class174.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) { - class174.bufferX[var20] = var5 + 1; - class174.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class174.directions[var18 + 1][var19] = 8; - class174.distances[var18 + 1][var19] = var16; - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { - break; - } - - ++var17; - } - } - - if (var19 > 0 && class174.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) { - class174.bufferX[var20] = var5; - class174.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class174.directions[var18][var19 - 1] = 1; - class174.distances[var18][var19 - 1] = var16; - break; - } - - if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var19 < 128 - var2 && class174.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) { - class174.bufferX[var20] = var5; - class174.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class174.directions[var18][var19 + 1] = 4; - class174.distances[var18][var19 + 1] = var16; - break; - } - - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 > 0 && class174.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class174.bufferX[var20] = var5 - 1; - class174.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class174.directions[var18 - 1][var19 - 1] = 3; - class174.distances[var18 - 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && var19 > 0 && class174.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class174.bufferX[var20] = var5 + 1; - class174.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class174.directions[var18 + 1][var19 - 1] = 9; - class174.distances[var18 + 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 < 128 - var2 && class174.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 - 1][var17 + var15] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { - continue label282; - } - } - - class174.bufferX[var20] = var5 - 1; - class174.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class174.directions[var18 - 1][var19 + 1] = 6; - class174.distances[var18 - 1][var19 + 1] = var16; - } - } while(var18 >= 128 - var2); - } while(var19 >= 128 - var2); - } while(class174.directions[var18 + 1][var19 + 1] != 0); - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); - - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { - continue label305; + if (var7 == '+') { // L: 48 + break label85; } } - class174.bufferX[var20] = var5 + 1; - class174.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class174.directions[var18 + 1][var19 + 1] = 12; - class174.distances[var18 + 1][var19 + 1] = var16; - } - } - } + int var9; + if (var7 >= '0' && var7 <= '9') { // L: 50 + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { // L: 51 + var9 = var7 - '7'; + } else { + if (var7 < 'a' || var7 > 'z') { // L: 52 + var1 = false; // L: 54 + break; + } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lpa;", - garbageValue = "2085861748" - ) - public static PrivateChatMode method2671(int var0) { - PrivateChatMode[] var1 = Skeleton.method4196(); + var9 = var7 - 'W'; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field4414) { - return var3; + if (var9 >= 10) { // L: 57 + var1 = false; // L: 58 + break; // L: 59 + } + + if (var2) { // L: 61 + var9 = -var9; + } + + int var8 = var4 * 10 + var9; // L: 62 + if (var4 != var8 / 10) { // L: 63 + var1 = false; // L: 64 + break; // L: 65 + } + + var4 = var8; // L: 67 + var3 = true; // L: 68 } + + ++var6; // L: 41 } - return null; + return var1; // L: 72 } - @ObfuscatedName("v") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "32" + descriptor = "(ILbp;ZI)I", + garbageValue = "1332153952" ) - public static String method2670(CharSequence var0) { - return StructComposition.method3152('*', var0.length()); - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "942143670" - ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - WorldMapDecorationType.clientPreferences.soundEffectsVolume = var0; - ScriptFrame.savePreferences(); + static int method2738(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2489 + if (var0 == 3702) { // L: 2494 + ++class14.Interpreter_intStackSize; // L: 2495 + return 1; // L: 2496 + } else { + return 2; // L: 2498 + } + } else { + --class14.Interpreter_intStackSize; // L: 2490 + --class295.Interpreter_stringStackSize; // L: 2491 + return 1; // L: 2492 + } } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index dfd630b154..24f6dbb24a 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -5,78 +5,160 @@ import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("v") +@ObfuscatedName("t") class class13 extends DefaultTlsClient { - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("h") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lme;" - ) - static Bounds field76; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lk;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lg;)V" + descriptor = "(Lk;)V" ) class13(class12 var1) { - this.this$1 = var1; + this.this$1 = var1; // L: 229 } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); - if (var1 == null) { - var1 = new Hashtable(); + Hashtable var1 = super.getClientExtensions(); // L: 231 + if (var1 == null) { // L: 232 + var1 = new Hashtable(); // L: 233 } - 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; + byte[] var2 = this.this$1.val$host.getBytes(); // L: 235 + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 236 + DataOutputStream var4 = new DataOutputStream(var3); // L: 237 + var4.writeShort(var2.length + 3); // L: 238 + var4.writeByte(0); // L: 239 + var4.writeShort(var2.length); // L: 240 + var4.write(var2); // L: 241 + var4.close(); // L: 242 + var1.put(0, var3.toByteArray()); // L: 243 + return var1; // L: 244 } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); + return new class11(this); // L: 248 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Leo;", - garbageValue = "-93" + descriptor = "(Lop;Lnf;I)Lnf;", + garbageValue = "261617264" ) - @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); + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + int var4 = var2 - 1; // L: 21 + var4 |= var4 >>> 1; // L: 22 + var4 |= var4 >>> 2; // L: 23 + var4 |= var4 >>> 4; // L: 24 + var4 |= var4 >>> 8; // L: 25 + var4 |= var4 >>> 16; // L: 26 + var3 = var4 + 1; // L: 27 + var1 = new IterableNodeHashTable(var3); // L: 30 + } + + for (var3 = 0; var3 < var2; ++var3) { // L: 32 + boolean var7 = var0.readUnsignedByte() == 1; // L: 33 + int var5 = var0.readMedium(); // L: 34 + Object var6; + if (var7) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 36 + } else { + var6 = new IntegerNode(var0.readInt()); // L: 37 + } + + var1.put((Node)var6, (long)var5); // L: 38 + } + + return var1; // L: 40 } - @ObfuscatedName("eq") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lky;Ljava/lang/String;I)V", - garbageValue = "1840812088" + descriptor = "(ILbp;ZI)I", + garbageValue = "719840218" ) - static void method167(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field521 += var2.groupCount; + static int method173(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1391 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1392 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var3)); // L: 1393 + return 1; // L: 1394 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1396 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1403 + if (var3.dataText == null) { // L: 1404 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1405 + } + + return 1; // L: 1406 + } else { + return 2; // L: 1408 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1397 + --var4; // L: 1398 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1399 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1400 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1401 + } } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(Ljf;IIIIIII)V", + garbageValue = "909796147" + ) + static final void method177(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field465) { // L: 10294 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10295 + } + + Client.field465 = false; // L: 10296 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10297 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10298 + var0.scrollY -= 4; // L: 10299 + class184.invalidateWidget(var0); // L: 10300 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10302 + var0.scrollY += 4; // L: 10303 + class184.invalidateWidget(var0); // L: 10304 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10306 + var7 = var3 * (var3 - 32) / var4; // L: 10307 + if (var7 < 8) { // L: 10308 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10309 + int var9 = var3 - 32 - var7; // L: 10310 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10311 + class184.invalidateWidget(var0); // L: 10312 + Client.field465 = true; // L: 10313 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10316 + var7 = var0.width; // L: 10317 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10318 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10319 + class184.invalidateWidget(var0); // L: 10320 + } + } + + } // L: 10323 } diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java index eb454b6836..67ade08f00 100644 --- a/runescape-client/src/main/java/class130.java +++ b/runescape-client/src/main/java/class130.java @@ -1,21 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("ed") public class class130 extends class116 { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lgt;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 49834049 + intValue = -766044217 ) - int field1482; + int field1481; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -27,200 +20,111 @@ public class class130 extends class116 { ) class130(class119 var1) { this.this$0 = var1; - this.field1482 = -1; - } + this.field1481 = -1; // L: 213 + } // L: 215 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1482 = var1.readUnsignedShort(); - } + void vmethod2847(Buffer var1) { + this.field1481 = var1.readUnsignedShort(); // L: 218 + } // L: 219 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2592(this.field1482); - } + void vmethod2848(ClanSettings var1) { + var1.method2687(this.field1481); // L: 222 + } // L: 223 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "99" + descriptor = "(I)[Lii;", + garbageValue = "1725898697" ) - public static void method2677(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; + public static class240[] method2748() { + return new class240[]{class240.field2782, class240.field2773, class240.field2774, class240.field2775, class240.field2777, class240.field2779, class240.field2778, class240.field2772, class240.field2780, class240.field2781}; // L: 17 } - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIIB)Z", + descriptor = "(IIIIB)V", garbageValue = "1" ) - static final boolean method2682(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; + static void method2746(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 85 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 86 + int var5 = 0; // L: 87 + if (var1 > var4.field771) { // L: 88 + var5 += var1 - var4.field771; + } else if (var1 < var4.x) { // L: 89 + var5 += var4.x - var1; + } - label69: - while (true) { - int var6 = var4.method7037(); - if (var6 == 0) { - return var3; - } + if (var2 > var4.field772) { // L: 90 + var5 += var2 - var4.field772; + } else if (var2 < var4.y) { // L: 91 + var5 += var4.y - var2; + } - var5 += var6; - int var7 = 0; - boolean var8 = false; - - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label69; + if (var5 - 64 <= var4.field773 && class408.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 92 + var5 -= 64; // L: 103 + if (var5 < 0) { // L: 104 + var5 = 0; } - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectComposition var15 = class245.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field545; - var3 = false; + int var6 = (var4.field773 - var5) * class408.clientPreferences.areaSoundEffectsVolume / var4.field773; // L: 105 + if (var4.stream1 == null) { // L: 106 + if (var4.soundEffectId >= 0) { // L: 107 + SoundEffect var7 = SoundEffect.readSoundEffect(class12.archive4, var4.soundEffectId, 0); // L: 108 + if (var7 != null) { // L: 109 + RawSound var8 = var7.toRawSound().resample(FontName.decimator); // L: 110 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 111 + var9.setNumLoops(-1); // L: 112 + BuddyRankComparator.pcmStreamMixer.addSubStream(var9); // L: 113 + var4.stream1 = var9; // L: 114 } + } + } else { + var4.stream1.method821(var6); // L: 118 + } - var8 = true; + if (var4.stream2 == null) { // L: 119 + if (var4.soundEffectIds != null && (var4.field779 -= var3) <= 0) { // L: 120 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 121 + SoundEffect var12 = SoundEffect.readSoundEffect(class12.archive4, var4.soundEffectIds[var11], 0); // L: 122 + if (var12 != null) { // L: 123 + RawSound var13 = var12.toRawSound().resample(FontName.decimator); // L: 124 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 125 + var10.setNumLoops(0); // L: 126 + BuddyRankComparator.pcmStreamMixer.addSubStream(var10); // L: 127 + var4.stream2 = var10; // L: 128 + var4.field779 = var4.field767 + (int)(Math.random() * (double)(var4.field776 - var4.field767)); // L: 129 + } + } + } else { + var4.stream2.method821(var6); // L: 134 + if (!var4.stream2.hasNext()) { // L: 135 + var4.stream2 = null; // L: 136 } } + } else { + if (var4.stream1 != null) { // L: 93 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var4.stream1); // L: 94 + var4.stream1 = null; // L: 95 + } + + if (var4.stream2 != null) { // L: 97 + BuddyRankComparator.pcmStreamMixer.removeSubStream(var4.stream2); // L: 98 + var4.stream2 = null; // L: 99 + } } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); - } - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-683138531" - ) - static int method2683(int var0, Script var1, boolean var2) { - if (var0 == 6900) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 6950) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "19136899" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } - - if (var3 < 1) { - var3 = 1; - } - - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field744; - } else if (var5 >= 100) { - var6 = Client.field747; - } else { - var6 = (Client.field747 - Client.field744) * var5 / 100 + Client.field744; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var17; - if (var7 < Client.field750) { - var17 = Client.field750; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 > Client.field749) { - var6 = Client.field749; - 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; - var2 -= var9 * 2; - } - } else if (var7 > Client.field501) { - var17 = Client.field501; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 < Client.field748) { - var6 = Client.field748; - 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; - var3 -= var9 * 2; } } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - int[] var16 = new int[9]; - - for (var9 = 0; var9 < var16.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = NetCache.method5335(var10); - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var14 = var3 - 334; - if (var14 < 0) { - var14 = 0; - } else if (var14 > 100) { - var14 = 100; - } - - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; - int var13 = var11 * var15 / 256; - var16[var9] = var13 * var12 >> 16; - } - - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; - } + } // L: 140 } diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java index add0e308f5..cdfafe89c6 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -1,32 +1,33 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("ej") public class class131 extends class116 { - @ObfuscatedName("m") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("en") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1300731739 + ) + static int field1485; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lkj;" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("l") + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -3900186400137069511L + longValue = -7049203579552523343L ) - long field1486; - @ObfuscatedName("q") - String field1484; - @ObfuscatedName("f") + long field1487; + @ObfuscatedName("w") + String field1486; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 655775571 + intValue = -121846283 ) - int field1487; + int field1489; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -38,72 +39,73 @@ public class class131 extends class116 { ) class131(class119 var1) { this.this$0 = var1; - this.field1486 = -1L; - this.field1484 = null; - this.field1487 = 0; - } + this.field1487 = -1L; // L: 93 + this.field1486 = null; // L: 94 + this.field1489 = 0; // L: 95 + } // L: 97 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1486 = var1.readLong(); + void vmethod2847(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 100 + --var1.offset; // L: 101 + this.field1487 = var1.readLong(); // L: 102 } - this.field1484 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1487 = var1.readUnsignedShort(); - } + this.field1486 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field1489 = var1.readUnsignedShort(); // L: 105 + } // L: 106 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2646(this.field1486, this.field1484, this.field1487); - } + void vmethod2848(ClanSettings var1) { + var1.method2655(this.field1487, this.field1486, this.field1489); // L: 109 + } // L: 110 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "387235799" + descriptor = "(I)V", + garbageValue = "-474591339" ) - static void method2690(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } + public static void method2753() { + try { + if (class247.musicPlayerStatus == 1) { // L: 38 + int var0 = class247.midiPcmStream.method4754(); // L: 39 + if (var0 > 0 && class247.midiPcmStream.isReady()) { // L: 40 + var0 -= class247.pcmSampleLength; // L: 41 + if (var0 < 0) { // L: 42 + var0 = 0; + } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lkl;Ljava/lang/String;Ljava/lang/String;B)Loz;", - garbageValue = "-74" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!VarbitComposition.method3102(var0, var3, var4)) { - var5 = null; - } else { - IndexedSprite var7 = new IndexedSprite(); - var7.width = class414.SpriteBuffer_spriteWidth; - var7.height = class408.SpriteBuffer_spriteHeight; - var7.xOffset = class135.SpriteBuffer_xOffsets[0]; - var7.yOffset = SpriteBuffer_yOffsets[0]; - var7.subWidth = class414.SpriteBuffer_spriteWidths[0]; - var7.subHeight = class16.SpriteBuffer_spriteHeights[0]; - var7.palette = class351.SpriteBuffer_spritePalette; - var7.pixels = class414.SpriteBuffer_pixels[0]; - StudioGame.method5130(); - var5 = var7; + class247.midiPcmStream.setPcmStreamVolume(var0); // L: 43 + return; // L: 44 + } + + class247.midiPcmStream.clear(); // L: 46 + class247.midiPcmStream.removeAll(); // L: 47 + if (class128.musicTrackArchive != null) { // L: 48 + class247.musicPlayerStatus = 2; + } else { + class247.musicPlayerStatus = 0; // L: 49 + } + + class14.musicTrack = null; // L: 50 + class247.soundCache = null; // L: 51 + } + } catch (Exception var2) { // L: 54 + var2.printStackTrace(); // L: 55 + class247.midiPcmStream.clear(); // L: 56 + class247.musicPlayerStatus = 0; // L: 57 + class14.musicTrack = null; // L: 58 + class247.soundCache = null; // L: 59 + class128.musicTrackArchive = null; // L: 60 } - return var5; - } + } // L: 62 } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index 26cfaa3424..5e198df5b1 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -1,149 +1,387 @@ import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("es") +@ObfuscatedName("eu") public abstract class class132 extends Node { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("jt") - @ObfuscatedGetter( - intValue = -1055383279 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + @ObfuscatedName("p") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; class132() { } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - abstract void vmethod2760(Buffer var1); + abstract void vmethod2839(Buffer var1); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" ) - abstract void vmethod2759(ClanChannel var1); + abstract void vmethod2838(ClanChannel var1); - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lmk;ZI)V", - garbageValue = "1491727456" + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-1801380146" ) - public static void method2698(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { + @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; + short var7 = var1[var4]; // L: 19 + var1[var4] = var1[var3]; // L: 20 + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } } - NetCache.NetCache_socket = null; + 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); } - NetCache.NetCache_socket = var0; - Buffer var2; - if (NetCache.NetCache_socket != null) { - try { - var2 = new Buffer(4); - var2.writeByte(var1 ? 2 : 3); - var2.writeMedium(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lop;Ljava/lang/String;B)I", + garbageValue = "101" + ) + public static int method2769(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + int var4 = var1.length(); // L: 21 + byte[] var5 = new byte[var4]; // L: 22 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 23 + char var7 = var1.charAt(var6); // L: 24 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25 + var5[var6] = (byte)var7; + } else if (var7 == 8364) { // L: 26 + var5[var6] = -128; + } else if (var7 == 8218) { // L: 27 + var5[var6] = -126; + } else if (var7 == 402) { // L: 28 + var5[var6] = -125; + } else if (var7 == 8222) { // L: 29 + var5[var6] = -124; + } else if (var7 == 8230) { // L: 30 + var5[var6] = -123; + } else if (var7 == 8224) { // L: 31 + var5[var6] = -122; + } else if (var7 == 8225) { // L: 32 + var5[var6] = -121; + } else if (var7 == 710) { // L: 33 + var5[var6] = -120; + } else if (var7 == 8240) { // L: 34 + var5[var6] = -119; + } else if (var7 == 352) { // L: 35 + var5[var6] = -118; + } else if (var7 == 8249) { // L: 36 + var5[var6] = -117; + } else if (var7 == 338) { // L: 37 + var5[var6] = -116; + } else if (var7 == 381) { // L: 38 + var5[var6] = -114; + } else if (var7 == 8216) { // L: 39 + var5[var6] = -111; + } else if (var7 == 8217) { // L: 40 + var5[var6] = -110; + } else if (var7 == 8220) { // L: 41 + var5[var6] = -109; + } else if (var7 == 8221) { // L: 42 + var5[var6] = -108; + } else if (var7 == 8226) { // L: 43 + var5[var6] = -107; + } else if (var7 == 8211) { // L: 44 + var5[var6] = -106; + } else if (var7 == 8212) { // L: 45 + var5[var6] = -105; + } else if (var7 == 732) { // L: 46 + var5[var6] = -104; + } else if (var7 == 8482) { // L: 47 + var5[var6] = -103; + } else if (var7 == 353) { // L: 48 + var5[var6] = -102; + } else if (var7 == 8250) { // L: 49 + var5[var6] = -101; + } else if (var7 == 339) { // L: 50 + var5[var6] = -100; + } else if (var7 == 382) { // L: 51 + var5[var6] = -98; + } else if (var7 == 376) { // L: 52 + var5[var6] = -97; + } else { + var5[var6] = 63; // L: 53 + } + } + + var0.writeSmartByteShort(var5.length); // L: 58 + var0.offset += class264.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 + return var0.offset - var2; // L: 60 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-79187056" + ) + static int method2766(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 617 + Widget var3; + if (var0 >= 2000) { // L: 618 + var0 -= 1000; // L: 619 + var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 620 + var3 = UserComparator9.getWidget(var4); // L: 621 + } else { + var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 623 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 624 + class14.Interpreter_intStackSize -= 2; // L: 625 + var3.scrollX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 626 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 627 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 628 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 629 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 630 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 631 + var3.scrollY = 0; + } + + class184.invalidateWidget(var3); // L: 632 + return 1; // L: 633 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 635 + var3.color = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 636 + class184.invalidateWidget(var3); // L: 637 + return 1; // L: 638 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 640 + var3.fill = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 641 + class184.invalidateWidget(var3); // L: 642 + return 1; // L: 643 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 645 + var3.transparencyTop = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 646 + class184.invalidateWidget(var3); // L: 647 + return 1; // L: 648 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 650 + var3.lineWid = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 651 + class184.invalidateWidget(var3); // L: 652 + return 1; // L: 653 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 655 + var3.spriteId2 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 656 + class184.invalidateWidget(var3); // L: 657 + return 1; // L: 658 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 660 + var3.spriteAngle = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 661 + class184.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 665 + var3.spriteTiling = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 666 + class184.invalidateWidget(var3); // L: 667 + return 1; // L: 668 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 670 + var3.modelType = 1; // L: 671 + var3.modelId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 672 + class184.invalidateWidget(var3); // L: 673 + return 1; // L: 674 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 676 + class14.Interpreter_intStackSize -= 6; // L: 677 + var3.modelOffsetX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 678 + var3.modelOffsetY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 679 + var3.modelAngleX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 680 + var3.modelAngleY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 681 + var3.modelAngleZ = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 4]; // L: 682 + var3.modelZoom = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 5]; // L: 683 + class184.invalidateWidget(var3); // L: 684 + return 1; // L: 685 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 687 + var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 688 + if (var8 != var3.sequenceId) { // L: 689 + var3.sequenceId = var8; // L: 690 + var3.modelFrame = 0; // L: 691 + var3.modelFrameCycle = 0; // L: 692 + class184.invalidateWidget(var3); // L: 693 } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; + return 1; // L: 695 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 697 + var3.modelOrthog = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 698 + class184.invalidateWidget(var3); // L: 699 + return 1; // L: 700 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 702 + String var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 703 + if (!var7.equals(var3.text)) { // L: 704 + var3.text = var7; // L: 705 + class184.invalidateWidget(var3); // L: 706 + } + + return 1; // L: 708 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 710 + var3.fontId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 711 + class184.invalidateWidget(var3); // L: 712 + return 1; // L: 713 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 715 + class14.Interpreter_intStackSize -= 3; // L: 716 + var3.textXAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 717 + var3.textYAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 718 + var3.textLineHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 719 + class184.invalidateWidget(var3); // L: 720 + return 1; // L: 721 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 723 + var3.textShadowed = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 724 + class184.invalidateWidget(var3); // L: 725 + return 1; // L: 726 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 728 + var3.outline = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 729 + class184.invalidateWidget(var3); // L: 730 + return 1; // L: 731 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 733 + var3.spriteShadow = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 734 + class184.invalidateWidget(var3); // L: 735 + return 1; // L: 736 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 738 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 739 + class184.invalidateWidget(var3); // L: 740 + return 1; // L: 741 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 743 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 744 + class184.invalidateWidget(var3); // L: 745 + return 1; // L: 746 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 748 + class14.Interpreter_intStackSize -= 2; // L: 749 + var3.scrollWidth = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 750 + var3.scrollHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 751 + class184.invalidateWidget(var3); // L: 752 + if (var4 != -1 && var3.type == 0) { // L: 753 + MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 754 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 756 + class92.resumePauseWidget(var3.id, var3.childIndex); // L: 757 + Client.meslayerContinueWidget = var3; // L: 758 + class184.invalidateWidget(var3); // L: 759 + return 1; // L: 760 + } else if (var0 == 1122) { // L: 762 + var3.spriteId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 763 + class184.invalidateWidget(var3); // L: 764 + return 1; // L: 765 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 767 + var3.color2 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 768 + class184.invalidateWidget(var3); // L: 769 + return 1; // L: 770 + } else if (var0 == 1124) { // L: 772 + var3.transparencyBot = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 773 + class184.invalidateWidget(var3); // L: 774 + return 1; // L: 775 + } else if (var0 == 1125) { // L: 777 + var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 778 + FillMode var6 = (FillMode)UserComparator4.findEnumerated(Ignored.FillMode_values(), var8); // L: 779 + if (var6 != null) { // L: 780 + var3.fillMode = var6; // L: 781 + class184.invalidateWidget(var3); // L: 782 + } + + return 1; // L: 784 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 786 + var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 787 + var3.field3085 = var5; // L: 788 + return 1; // L: 789 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 791 + var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 792 + var3.modelTransparency = var5; // L: 793 + return 1; // L: 794 + } else if (var0 == 1128) { // L: 796 + class14.Interpreter_intStackSize -= 2; // L: 797 + return 1; // L: 798 + } else { + return 2; // L: 800 + } } } + } - NetCache.NetCache_responseHeaderBuffer.offset = 0; - ClanChannel.NetCache_currentResponse = null; - StudioGame.NetCache_responseArchiveBuffer = null; - NetCache.field3726 = 0; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Ljava/net/Socket;III)Lmp;", + garbageValue = "-2068064468" + ) + public static AbstractSocket method2767(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); // L: 10 + } - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var9 == null) { - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var9 == null) { - if (NetCache.field3724 != 0) { - try { - var2 = new Buffer(4); - var2.writeByte(4); - var2.writeByte(NetCache.field3724); - var2.writeShort(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var4) { - } + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(Lcx;ZI)V", + garbageValue = "1479413091" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 5060 + var0.isUnanimated = false; // L: 5061 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 5062 5063 + var0.isUnanimated = true; + } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } + int var2 = var0.x >> 7; // L: 5065 + int var3 = var0.y >> 7; // L: 5066 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 5067 + long var4 = PacketBuffer.calculateTag(0, 0, 0, false, var0.index); // L: 5068 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 5069 + var0.isUnanimated = false; // L: 5070 + var0.tileHeight = class392.getTileHeight(var0.x, var0.y, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5071 + var0.playerCycle = Client.cycle; // L: 5072 + GameBuild.scene.addNullableObject(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 5073 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 5076 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 5077 + return; } - NetCache.NetCache_loadTime = 0; - NetCache.field3715 = UserComparator4.method2406(); - return; + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 5078 } - NetCache.NetCache_pendingWritesQueue.addLast(var9); - NetCache.NetCache_pendingWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; + var0.tileHeight = class392.getTileHeight(var0.x, var0.y, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5080 + var0.playerCycle = Client.cycle; // L: 5081 + GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 5082 } } - - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - } - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - static void method2699() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - int var2 = Client.menuOpcodes[var0]; - boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; - if (var1) { - if (var0 < Client.menuOptionsCount - 1) { - for (int var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { - Client.menuActions[var3] = Client.menuActions[var3 + 1]; - Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; - Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; - Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; - Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; - Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; - Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; - } - } - - --var0; - --Client.menuOptionsCount; - } } - Widget.method4997(UserComparator7.menuWidth / 2 + LoginScreenAnimation.menuX, class392.menuY); - } + } // L: 5086 } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index b57e429b3a..a4e5eaa20e 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -3,146 +3,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("eh") public class class133 { - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -7010502631349948943L + @ObfuscatedName("ue") + @ObfuscatedSignature( + descriptor = "Lng;" ) - long field1499; - @ObfuscatedName("q") + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -5422378692858093787L + intValue = 47036115 + ) + static int field1499; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = 2363637495059539125L ) long field1494; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkt;" + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = 132184713843925465L ) - IterableNodeDeque field1493; + long field1492; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkf;" + ) + IterableNodeDeque field1500; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) public class133(Buffer var1) { - this.field1494 = -1L; - this.field1493 = new IterableNodeDeque(); - this.method2704(var1); - } + this.field1492 = -1L; // L: 10 + this.field1500 = new IterableNodeDeque(); // L: 11 + this.method2770(var1); // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-1667540197" + descriptor = "(Lop;I)V", + garbageValue = "-354049752" ) - void method2704(Buffer var1) { - this.field1499 = var1.readLong(); - this.field1494 = var1.readLong(); + void method2770(Buffer var1) { + this.field1494 = var1.readLong(); // L: 23 + this.field1492 = var1.readLong(); // L: 24 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 Object var3; - if (var2 == 1) { + if (var2 == 1) { // L: 28 var3 = new class128(this); } else if (var2 == 4) { - var3 = new class139(this); - } else if (var2 == 3) { + var3 = new class139(this); // L: 29 + } else if (var2 == 3) { // L: 30 var3 = new class124(this); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 31 var3 = new class122(this); } else { - if (var2 != 5) { - throw new RuntimeException(""); + if (var2 != 5) { // L: 32 + throw new RuntimeException(""); // L: 33 } var3 = new class129(this); } - ((class132)var3).vmethod2760(var1); - this.field1493.addFirst((Node)var3); + ((class132)var3).vmethod2839(var1); // L: 34 + this.field1500.addFirst((Node)var3); // L: 35 } - } + } // L: 38 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "-2050945846" + descriptor = "(Lea;I)V", + garbageValue = "1626491571" ) - public void method2701(ClanChannel var1) { - if (var1.key == this.field1499 && this.field1494 == var1.field1515) { - for (class132 var2 = (class132)this.field1493.last(); var2 != null; var2 = (class132)this.field1493.previous()) { - var2.vmethod2759(var1); + public void method2777(ClanChannel var1) { + if (this.field1494 == var1.key && this.field1492 == var1.field1514) { // L: 41 + for (class132 var2 = (class132)this.field1500.last(); var2 != null; var2 = (class132)this.field1500.previous()) { // L: 42 + var2.vmethod2838(var1); // L: 43 } - ++var1.field1515; + ++var1.field1514; // L: 45 } else { throw new RuntimeException(""); } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ILmm;Lky;I)V", - garbageValue = "364111545" - ) - static void method2707(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3671 == 0) { - Huffman.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - Huffman.ArchiveDiskActionHandler_thread.setDaemon(true); - Huffman.ArchiveDiskActionHandler_thread.start(); - Huffman.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3671 = 600; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1000126094" - ) - static int method2706(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; - } - } - - @ObfuscatedName("a") - static boolean method2702(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "82" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + } // L: 46 } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index 6ad72e1596..60ff38d1eb 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -1,22 +1,32 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ec") public class class134 extends class116 { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -505118103 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lko;" ) - int field1506; - @ObfuscatedName("q") + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = 1790631941 + intValue = -1434510609 ) - int field1503; + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1414305525 + ) + int field1501; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1373462747 + ) + int field1502; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -27,194 +37,49 @@ public class class134 extends class116 { descriptor = "(Ldg;)V" ) class134(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 271 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1506 = var1.readInt(); - this.field1503 = var1.readInt(); - } + void vmethod2847(Buffer var1) { + this.field1501 = var1.readInt(); // L: 274 + this.field1502 = var1.readInt(); // L: 275 + } // L: 276 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2597(this.field1506, this.field1503); - } + void vmethod2848(ClanSettings var1) { + var1.method2664(this.field1501, this.field1502); // L: 279 + } // L: 280 - @ObfuscatedName("l") - public static final int method2708(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (0.0D != var2) { - double var12; - if (var4 < 0.5D) { - var12 = (1.0D + var2) * var4; - } else { - var12 = var4 + var2 - var4 * var2; - } - - double var14 = var4 * 2.0D - var12; - double var16 = 0.3333333333333333D + var0; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var16 * 6.0D * (var12 - var14) + var14; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = var14 + (var12 - var14) * (0.6666666666666666D - var16) * 6.0D; - } else { - var6 = var14; - } - - if (6.0D * var0 < 1.0D) { - var8 = var0 * (var12 - var14) * 6.0D + var14; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var14 + var20 * (var12 - var14) * 6.0D; - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = 6.0D * (var12 - var14) * (0.6666666666666666D - var20) + var14; - } else { - var10 = var14; - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-1799070908" + ) + public static String method2788(CharSequence var0) { + String var1 = FontName.base37DecodeLong(WorldMapScaleHandler.method4096(var0)); // L: 57 + if (var1 == null) { + var1 = ""; // L: 58 } - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(256.0D * var8); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; + return var1; // L: 59 } - @ObfuscatedName("l") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/io/File;", - garbageValue = "-12819" + descriptor = "(S)I", + garbageValue = "7395" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljt;I[B[BI)V", - garbageValue = "676487330" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3115 == null) { - if (var2 == null) { - return; - } - - var0.field3115 = new byte[11][]; - var0.field3123 = new byte[11][]; - var0.field3147 = new int[11]; - var0.field3066 = new int[11]; - } - - var0.field3115[var1] = var2; - if (var2 != null) { - var0.field3121 = true; - } else { - var0.field3121 = false; - - for (int var4 = 0; var4 < var0.field3115.length; ++var4) { - if (var0.field3115[var4] != null) { - var0.field3121 = true; - break; - } - } - } - - var0.field3123[var1] = var3; - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(Lfe;IIII)V", - garbageValue = "1522146885" - ) - static void method2716(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - int var4 = var0.soundEffects[var1]; - if (var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } - } - } + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 4552 } } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index a135b2ca52..f51f333927 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -1,23 +1,15 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("ek") public class class135 extends class116 { - @ObfuscatedName("j") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1442996561 + intValue = 696533307 ) - int field1508; + int field1509; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -29,48 +21,189 @@ public class class135 extends class116 { ) class135(class119 var1) { this.this$0 = var1; - this.field1508 = -1; + this.field1509 = -1; // L: 144 + } // L: 146 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" + ) + void vmethod2847(Buffer var1) { + this.field1509 = var1.readUnsignedShort(); // L: 149 + } // L: 150 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" + ) + void vmethod2848(ClanSettings var1) { + var1.method2661(this.field1509); // L: 153 + } // L: 154 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Le;", + garbageValue = "588193737" + ) + public static class6[] method2797() { + return new class6[]{class6.field14}; // L: 12 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "1" ) - void vmethod2767(Buffer var1) { - this.field1508 = var1.readUnsignedShort(); - } + static String method2795(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 62 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" - ) - void vmethod2766(ClanSettings var1) { - var1.method2594(this.field1508); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BS)Lon;", - garbageValue = "1536" - ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var2 * var3]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new SpritePixels(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63 + int var5 = var0[var4] & 255; // L: 64 + var3.append(class317.field3854[var5 >>> 2]); // L: 65 + if (var4 < var2 - 1) { // L: 66 + int var6 = var0[var4 + 1] & 255; // L: 67 + var3.append(class317.field3854[(var5 & 3) << 4 | var6 >>> 4]); // L: 68 + if (var4 < var2 - 2) { // L: 69 + int var7 = var0[var4 + 2] & 255; // L: 70 + var3.append(class317.field3854[(var6 & 15) << 2 | var7 >>> 6]).append(class317.field3854[var7 & 63]); // L: 71 + } else { + var3.append(class317.field3854[(var6 & 15) << 2]).append("="); // L: 73 + } + } else { + var3.append(class317.field3854[(var5 & 3) << 4]).append("=="); // L: 75 + } } - return new SpritePixels(0, 0); + return var3.toString(); // L: 77 } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(Lct;II)V", + garbageValue = "-1430389228" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + if (var0.field1131 >= Client.cycle) { // L: 4255 + var2 = Math.max(1, var0.field1131 - Client.cycle); // L: 4256 + var3 = var0.field1087 * 64 + var0.field1083 * 128; // L: 4257 + var4 = var0.field1087 * 64 + var0.field1100 * 128; // L: 4258 + var0.x += (var3 - var0.x) / var2; // L: 4259 + var0.y += (var4 - var0.y) / var2; // L: 4260 + var0.field1085 = 0; // L: 4261 + var0.orientation = var0.field1133; // L: 4262 + } else if (var0.field1132 >= Client.cycle) { // L: 4264 + if (var0.field1132 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > MouseHandler.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4265 + var2 = var0.field1132 - var0.field1131; // L: 4266 + var3 = Client.cycle - var0.field1131; // L: 4267 + var4 = var0.field1087 * 64 + var0.field1083 * 128; // L: 4268 + int var5 = var0.field1087 * 64 + var0.field1100 * 128; // L: 4269 + int var6 = var0.field1087 * 64 + var0.field1128 * 128; // L: 4270 + int var7 = var0.field1087 * 64 + var0.field1130 * 128; // L: 4271 + var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; // L: 4272 + var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2; // L: 4273 + } + + var0.field1085 = 0; // L: 4275 + var0.orientation = var0.field1133; // L: 4276 + var0.rotation = var0.orientation; // L: 4277 + } else { + class138.method2836(var0); // L: 4279 + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4280 + var0.sequence = -1; // L: 4281 + var0.spotAnimation = -1; // L: 4282 + var0.field1131 = 0; // L: 4283 + var0.field1132 = 0; // L: 4284 + var0.x = var0.field1087 * 64 + var0.pathX[0] * 128; // L: 4285 + var0.y = var0.pathY[0] * 128 + var0.field1087 * 64; // L: 4286 + var0.method2165(); // L: 4287 + } + + if (HealthBarDefinition.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4289 4290 + var0.sequence = -1; // L: 4291 + var0.spotAnimation = -1; // L: 4292 + var0.field1131 = 0; // L: 4293 + var0.field1132 = 0; // L: 4294 + var0.x = var0.pathX[0] * 128 + var0.field1087 * 64; // L: 4295 + var0.y = var0.field1087 * 64 + var0.pathY[0] * 128; // L: 4296 + var0.method2165(); // L: 4297 + } + + WorldMapManager.method3814(var0); // L: 4300 + ClientPacket.method4709(var0); // L: 4301 + } // L: 4302 + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "([Ljf;II)V", + garbageValue = "1696973469" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11320 + Widget var3 = var0[var2]; // L: 11321 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Varcs.isComponentHidden(var3))) { // L: 11322 11323 11324 + if (var3.type == 0) { // L: 11325 + if (!var3.isIf3 && Varcs.isComponentHidden(var3) && var3 != WorldMapData_0.mousedOverWidgetIf1) { // L: 11326 + continue; + } + + drawModelComponents(var0, var3.id); // L: 11327 + if (var3.children != null) { // L: 11328 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11329 + if (var4 != null) { // L: 11330 + DirectByteArrayCopier.method5179(var4.group); + } + } + + if (var3.type == 6) { // L: 11332 + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11333 + boolean var7 = class128.runCs1(var3); // L: 11334 + if (var7) { // L: 11336 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11337 + } + + if (var5 != -1) { // L: 11338 + SequenceDefinition var6 = MouseHandler.SequenceDefinition_get(var5); // L: 11339 + + for (var3.modelFrameCycle += Client.field531; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class184.invalidateWidget(var3)) { // L: 11340 11341 11348 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11342 + ++var3.modelFrame; // L: 11343 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11344 + var3.modelFrame -= var6.frameCount; // L: 11345 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11346 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3165 != 0 && !var3.isIf3) { // L: 11352 + int var8 = var3.field3165 >> 16; // L: 11353 + var5 = var3.field3165 << 16 >> 16; // L: 11354 + var8 *= Client.field531; // L: 11355 + var5 *= Client.field531; // L: 11356 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11357 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11358 + class184.invalidateWidget(var3); // L: 11359 + } + } + } + } + + } // L: 11363 } diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java index a184030026..5703b028ce 100644 --- a/runescape-client/src/main/java/class137.java +++ b/runescape-client/src/main/java/class137.java @@ -1,20 +1,52 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("em") public class class137 { - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 808161859 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("my") + @ObfuscatedName("b") + public static short[][] field1519; + + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "Lbb;" + descriptor = "(Ljf;I)V", + garbageValue = "644093212" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; + static final void method2826(Widget var0) { + int var1 = var0.contentType; // L: 11468 + if (var1 == 324) { // L: 11469 + if (Client.field737 == -1) { // L: 11470 + Client.field737 = var0.spriteId2; // L: 11471 + Client.field581 = var0.spriteId; // L: 11472 + } + + if (Client.playerAppearance.isFemale) { // L: 11474 + var0.spriteId2 = Client.field737; + } else { + var0.spriteId2 = Client.field581; // L: 11475 + } + + } else if (var1 == 325) { // L: 11478 + if (Client.field737 == -1) { // L: 11479 + Client.field737 = var0.spriteId2; // L: 11480 + Client.field581 = var0.spriteId; // L: 11481 + } + + if (Client.playerAppearance.isFemale) { // L: 11483 + var0.spriteId2 = Client.field581; + } else { + var0.spriteId2 = Client.field737; // L: 11484 + } + + } else if (var1 == 327) { // L: 11487 + var0.modelAngleX = 150; // L: 11488 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11489 + var0.modelType = 5; // L: 11490 + var0.modelId = 0; // L: 11491 + } else if (var1 == 328) { // L: 11494 + var0.modelAngleX = 150; // L: 11495 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11496 + var0.modelType = 5; // L: 11497 + var0.modelId = 1; // L: 11498 + } + } // L: 11476 11485 11492 11499 11501 } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index fbb1b5385b..622c134d18 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -3,15 +3,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("ep") public class class138 extends class116 { - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -4891272861278655519L + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lop;" ) - long field1531; - @ObfuscatedName("q") - String field1530; + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = 449318605468420723L + ) + long field1525; + @ObfuscatedName("w") + String field1524; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -23,211 +29,196 @@ public class class138 extends class116 { ) class138(class119 var1) { this.this$0 = var1; - this.field1531 = -1L; - this.field1530 = null; - } + this.field1525 = -1L; // L: 194 + this.field1524 = null; // L: 195 + } // L: 197 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1531 = var1.readLong(); + void vmethod2847(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 200 + --var1.offset; // L: 201 + this.field1525 = var1.readLong(); // L: 202 } - this.field1530 = var1.readStringCp1252NullTerminatedOrNull(); - } + this.field1524 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + } // L: 205 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2637(this.field1531, this.field1530); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2103757057" - ) - public static boolean method2756(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "1334798040" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class386.World_worlds != null) { - class184.doWorldSorting(0, class386.World_worlds.length - 1, var0, var1, var2, var3); - } - - } + void vmethod2848(ClanSettings var1) { + var1.method2658(this.field1525, this.field1524); // L: 208 + } // L: 209 @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "30429" - ) - public static void method2754() { - KitDefinition.KitDefinition_cached.clear(); + public static int method2827(long var0) { + return (int)(var0 >>> 0 & 127L); // L: 64 } - @ObfuscatedName("gc") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "776366170" + descriptor = "(Lct;I)V", + garbageValue = "-1003389326" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = PlayerComposition.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (0L != var5) { - var7 = PlayerComposition.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (class7.method60(var5)) { - var10 = var4; + static final void method2836(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 4305 + if (var0.pathLength == 0) { // L: 4306 + var0.field1085 = 0; // L: 4307 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4310 + SequenceDefinition var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4311 + if (var0.field1144 > 0 && var1.field1963 == 0) { // L: 4312 + ++var0.field1085; // L: 4313 + return; // L: 4314 + } + + if (var0.field1144 <= 0 && var1.field1956 == 0) { // L: 4316 + ++var0.field1085; // L: 4317 + return; // L: 4318 + } } - int[] var11 = class11.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = InterfaceParent.Entity_unpackID(var5); - ObjectComposition var14 = class245.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = GrandExchangeOfferTotalQuantityComparator.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 1) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var11[var12] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; - } - } - } - } - - var5 = PlayerComposition.scene.getGameObjectTag(var0, var1, var2); - if (0L != var5) { - var7 = PlayerComposition.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = InterfaceParent.Entity_unpackID(var5); - ObjectComposition var24 = class245.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var20 = GrandExchangeOfferTotalQuantityComparator.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) { - var12 = 15658734; - if (class7.method60(var5)) { - var12 = 15597568; - } - - int[] var18 = class11.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; + int var10 = var0.x; // L: 4321 + int var2 = var0.y; // L: 4322 + int var3 = var0.field1087 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4323 + int var4 = var0.field1087 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4324 + if (var10 < var3) { // L: 4325 + if (var2 < var4) { // L: 4326 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 4327 + var0.orientation = 1792; } else { - var18[var19 + 1536] = var12; - var18[var19 + 1 + 1024] = var12; - var18[var19 + 512 + 2] = var12; - var18[var19 + 3] = var12; + var0.orientation = 1536; // L: 4328 } + } else if (var10 > var3) { // L: 4330 + if (var2 < var4) { // L: 4331 + var0.orientation = 768; + } else if (var2 > var4) { // L: 4332 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 4333 + } + } else if (var2 < var4) { // L: 4335 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 4336 + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4337 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4338 + int var6 = var0.orientation - var0.rotation & 2047; // L: 4345 + if (var6 > 1024) { // L: 4346 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 4347 + if (var6 >= -256 && var6 <= 256) { // L: 4348 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 4349 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 4350 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 4351 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 4352 + int var8 = 4; // L: 4353 + boolean var9 = true; // L: 4354 + if (var0 instanceof NPC) { // L: 4355 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 4356 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1138 != 0) { // L: 4357 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 4358 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 4359 + var8 = 8; + } + + if (var0.field1085 > 0 && var0.pathLength > 1) { // L: 4360 + var8 = 8; // L: 4361 + --var0.field1085; // L: 4362 + } + } else { + if (var0.pathLength > 1) { // L: 4366 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 4367 + var8 = 8; + } + + if (var0.field1085 > 0 && var0.pathLength > 1) { // L: 4368 + var8 = 8; // L: 4369 + --var0.field1085; // L: 4370 + } + } + + if (var5 == 2) { // L: 4373 + var8 <<= 1; + } + + if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4374 + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var4 != var2) { // L: 4375 + if (var10 < var3) { // L: 4376 + var0.x += var8; // L: 4377 + if (var0.x > var3) { // L: 4378 + var0.x = var3; + } + } else if (var10 > var3) { // L: 4380 + var0.x -= var8; // L: 4381 + if (var0.x < var3) { // L: 4382 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 4384 + var0.y += var8; // L: 4385 + if (var0.y > var4) { // L: 4386 + var0.y = var4; + } + } else if (var2 > var4) { // L: 4388 + var0.y -= var8; // L: 4389 + if (var0.y < var4) { // L: 4390 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 4393 + --var0.pathLength; // L: 4394 + if (var0.field1144 > 0) { // L: 4395 + --var0.field1144; + } + } + + } else { + var0.x = var3; // L: 4339 + var0.y = var4; // L: 4340 + --var0.pathLength; // L: 4341 + if (var0.field1144 > 0) { // L: 4342 + --var0.field1144; + } + } } - - var5 = PlayerComposition.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = InterfaceParent.Entity_unpackID(var5); - ObjectComposition var21 = class245.getObjectDefinition(var7); - if (var21.mapSceneId != -1) { - IndexedSprite var22 = GrandExchangeOfferTotalQuantityComparator.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, var23 + (104 - var2 - var21.sizeY) * 4 + 48); - } - } - } - - } + } // L: 4308 4343 4397 } diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java index 48cc073830..d768b82d85 100644 --- a/runescape-client/src/main/java/class139.java +++ b/runescape-client/src/main/java/class139.java @@ -1,121 +1,484 @@ -import java.applet.Applet; -import java.net.URL; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ea") +@ObfuscatedName("el") public class class139 extends class132 { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1632895923 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Low;" ) - static int field1537; - @ObfuscatedName("l") - String field1536; - @ObfuscatedName("q") - byte field1533; - @ObfuscatedName("f") - byte field1534; + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("i") + String field1526; + @ObfuscatedName("w") + byte field1527; + @ObfuscatedName("s") + byte field1528; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Leh;" ) final class133 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Leh;)V" ) class139(class133 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 155 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "35" + descriptor = "(Lop;I)V", + garbageValue = "-1393452113" ) - void vmethod2760(Buffer var1) { - this.field1536 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1536 != null) { - var1.readUnsignedByte(); - this.field1533 = var1.readByte(); - this.field1534 = var1.readByte(); + void vmethod2839(Buffer var1) { + this.field1526 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 + if (this.field1526 != null) { // L: 159 + var1.readUnsignedByte(); // L: 160 + this.field1527 = var1.readByte(); // L: 161 + this.field1528 = var1.readByte(); // L: 162 } - } + } // L: 164 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Leb;I)V", - garbageValue = "1634989707" + descriptor = "(Lea;I)V", + garbageValue = "-1714930149" ) - void vmethod2759(ClanChannel var1) { - var1.name = this.field1536; - if (this.field1536 != null) { - var1.field1517 = this.field1533; - var1.field1512 = this.field1534; + void vmethod2838(ClanChannel var1) { + var1.name = this.field1526; // L: 167 + if (this.field1526 != null) { // L: 168 + var1.field1516 = this.field1527; // L: 169 + var1.field1511 = this.field1528; // L: 170 } - } + } // L: 172 - @ObfuscatedName("j") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-1485295086" + descriptor = "(ILbp;ZI)I", + garbageValue = "-907104971" ) - static boolean method2763(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class29.field165.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); + static int method2837(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2133 + if (class112.friendSystem.field765 == 0) { // L: 2134 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -2; + } else if (class112.friendSystem.field765 == 1) { // L: 2135 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.friendsList.getSize(); // L: 2136 + } + + return 1; // L: 2137 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2140 + if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2141 + Friend var8 = (Friend)class112.friendSystem.friendsList.get(var3); // L: 2142 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2143 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2144 } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2147 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2148 + } - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } + return 1; // L: 2150 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2153 + if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2154 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)class112.friendSystem.friendsList.get(var3)).world; // L: 2155 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2157 + } + + return 1; // L: 2158 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2161 + if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2162 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)class112.friendSystem.friendsList.get(var3)).rank; // L: 2163 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2165 + } + + return 1; // L: 2166 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2169 + int var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2170 + class11.method107(var5, var6); // L: 2171 + return 1; // L: 2172 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2175 + class112.friendSystem.addFriend(var5); // L: 2176 + return 1; // L: 2177 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2180 + class112.friendSystem.removeFriend(var5); // L: 2181 + return 1; // L: 2182 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2185 + class112.friendSystem.addIgnore(var5); // L: 2186 + return 1; // L: 2187 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2190 + class112.friendSystem.removeIgnore(var5); // L: 2191 + return 1; // L: 2192 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2195 + var5 = WallDecoration.method4643(var5); // L: 2196 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.isFriended(new Username(var5, GrandExchangeOfferUnitPriceComparator.loginType), false) ? 1 : 0; // L: 2197 + return 1; // L: 2198 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (AbstractArchive.friendsChat != null) { // L: 2201 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.name; // L: 2202 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2204 } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var10 = class27.method406(class29.field168, var2, new Object[]{(new URL(class29.field168.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class29.field168; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } + return 1; // L: 2205 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (AbstractArchive.friendsChat != null) { // L: 2208 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat.getSize(); // L: 2209 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2211 + } - try { - class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; + return 1; // L: 2212 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2215 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2216 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.get(var3).getUsername().getName(); // L: 2217 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2219 + } + + return 1; // L: 2220 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2223 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2224 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)AbstractArchive.friendsChat.get(var3)).getWorld(); // L: 2225 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2227 + } + + return 1; // L: 2228 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2231 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2232 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)AbstractArchive.friendsChat.get(var3)).rank; // L: 2233 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2235 + } + + return 1; // L: 2236 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat != null ? AbstractArchive.friendsChat.minKick : 0; // L: 2239 + return 1; // L: 2240 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2243 + Player.clanKickUser(var5); // L: 2244 + return 1; // L: 2245 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat != null ? AbstractArchive.friendsChat.rank * 1093956825 * 1525992297 : 0; // L: 2248 + return 1; // L: 2249 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2252 + GrandExchangeOfferOwnWorldComparator.Clan_joinChat(var5); // L: 2253 + return 1; // L: 2254 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class21.Clan_leaveChat(); // L: 2257 + return 1; // L: 2258 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class112.friendSystem.method1757()) { // L: 2261 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.ignoreList.getSize(); // L: 2262 + } + + return 1; // L: 2263 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2266 + if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.ignoreList.getSize()) { // L: 2267 + Ignored var4 = (Ignored)class112.friendSystem.ignoreList.get(var3); // L: 2268 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2269 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2270 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2273 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2274 + } + + return 1; // L: 2276 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2279 + var5 = WallDecoration.method4643(var5); // L: 2280 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.isIgnored(new Username(var5, GrandExchangeOfferUnitPriceComparator.loginType)) ? 1 : 0; // L: 2281 + return 1; // L: 2282 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2285 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && AbstractArchive.friendsChat.get(var3).getUsername().equals(HealthBarDefinition.localPlayer.username)) { // L: 2286 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2287 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2289 + } + + return 1; // L: 2290 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (AbstractArchive.friendsChat != null && AbstractArchive.friendsChat.owner != null) { // L: 2293 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.owner; // L: 2294 + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2296 + } + + return 1; // L: 2297 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2300 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && ((ClanMate)AbstractArchive.friendsChat.get(var3)).isFriend()) { // L: 2301 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2302 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2304 + } + + return 1; // L: 2305 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class112.friendSystem.friendsList.removeComparator(); // L: 2316 + return 1; // L: 2317 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2320 + class112.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2321 + return 1; // L: 2322 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2325 + class112.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2326 + return 1; // L: 2327 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2330 + class112.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2331 + return 1; // L: 2332 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2335 + class112.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2336 + return 1; // L: 2337 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2340 + class112.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2341 + return 1; // L: 2342 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2345 + class112.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2346 + return 1; // L: 2347 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2350 + class112.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2351 + return 1; // L: 2352 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2355 + class112.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2356 + return 1; // L: 2357 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2360 + class112.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2361 + return 1; // L: 2362 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2365 + class112.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2366 + return 1; // L: 2367 + } else if (var0 == 3639) { + class112.friendSystem.friendsList.sort(); // L: 2370 + return 1; // L: 2371 + } else if (var0 == 3640) { + class112.friendSystem.ignoreList.removeComparator(); // L: 2374 + return 1; // L: 2375 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2378 + class112.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2379 + return 1; // L: 2380 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2383 + class112.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2384 + return 1; // L: 2385 + } else if (var0 == 3643) { + class112.friendSystem.ignoreList.sort(); // L: 2388 + return 1; // L: 2389 + } else if (var0 == 3644) { + if (AbstractArchive.friendsChat != null) { // L: 2392 + AbstractArchive.friendsChat.removeComparator(); // L: 2393 + } + + return 1; // L: 2395 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2398 + if (AbstractArchive.friendsChat != null) { // L: 2399 + AbstractArchive.friendsChat.addComparator(new UserComparator1(var7)); // L: 2400 + } + + return 1; // L: 2402 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2405 + if (AbstractArchive.friendsChat != null) { // L: 2406 + AbstractArchive.friendsChat.addComparator(new UserComparator2(var7)); // L: 2407 + } + + return 1; // L: 2409 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2412 + if (AbstractArchive.friendsChat != null) { // L: 2413 + AbstractArchive.friendsChat.addComparator(new UserComparator3(var7)); // L: 2414 + } + + return 1; // L: 2416 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2419 + if (AbstractArchive.friendsChat != null) { // L: 2420 + AbstractArchive.friendsChat.addComparator(new UserComparator4(var7)); // L: 2421 + } + + return 1; // L: 2423 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2426 + if (AbstractArchive.friendsChat != null) { // L: 2427 + AbstractArchive.friendsChat.addComparator(new UserComparator5(var7)); // L: 2428 + } + + return 1; // L: 2430 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2433 + if (AbstractArchive.friendsChat != null) { // L: 2434 + AbstractArchive.friendsChat.addComparator(new UserComparator6(var7)); // L: 2435 + } + + return 1; // L: 2437 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2440 + if (AbstractArchive.friendsChat != null) { // L: 2441 + AbstractArchive.friendsChat.addComparator(new UserComparator7(var7)); // L: 2442 + } + + return 1; // L: 2444 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2447 + if (AbstractArchive.friendsChat != null) { // L: 2448 + AbstractArchive.friendsChat.addComparator(new UserComparator8(var7)); // L: 2449 + } + + return 1; // L: 2451 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2454 + if (AbstractArchive.friendsChat != null) { // L: 2455 + AbstractArchive.friendsChat.addComparator(new UserComparator9(var7)); // L: 2456 + } + + return 1; // L: 2458 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2461 + if (AbstractArchive.friendsChat != null) { // L: 2462 + AbstractArchive.friendsChat.addComparator(new UserComparator10(var7)); // L: 2463 + } + + return 1; // L: 2465 + } else if (var0 == 3655) { + if (AbstractArchive.friendsChat != null) { // L: 2468 + AbstractArchive.friendsChat.sort(); // L: 2469 + } + + return 1; // L: 2471 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2474 + class112.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2475 + return 1; // L: 2476 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2479 + if (AbstractArchive.friendsChat != null) { // L: 2480 + AbstractArchive.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2481 + } + + return 1; // L: 2483 + } else { + return 2; // L: 2485 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2308 + if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && ((ClanMate)AbstractArchive.friendsChat.get(var3)).isIgnored()) { // L: 2309 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2310 + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2312 + } + + return 1; // L: 2313 + } + } + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-1892812009" + ) + static int method2845(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4340 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4344 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4348 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4352 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4356 + if (var0 != 7031 && var0 != 7032) { // L: 4360 + if (var0 == 7033) { // L: 4365 + --class295.Interpreter_stringStackSize; // L: 4366 + return 1; // L: 4367 + } else if (var0 != 7036 && var0 != 7037) { // L: 4369 + if (var0 == 7038) { // L: 4373 + --class14.Interpreter_intStackSize; // L: 4374 + return 1; // L: 4375 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4377 + return 2; // L: 4381 + } else { + --class14.Interpreter_intStackSize; // L: 4378 + return 1; // L: 4379 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 4370 + return 1; // L: 4371 + } + } else { + --class295.Interpreter_stringStackSize; // L: 4361 + --class14.Interpreter_intStackSize; // L: 4362 + return 1; // L: 4363 + } + } else { + --class14.Interpreter_intStackSize; // L: 4357 + return 1; // L: 4358 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 4353 + return 1; // L: 4354 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 4349 + return 1; // L: 4350 + } + } else { + class14.Interpreter_intStackSize -= 3; // L: 4345 + return 1; // L: 4346 } } else { - throw new IllegalArgumentException(); + class14.Interpreter_intStackSize -= 5; // L: 4341 + return 1; // L: 4342 } } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 4d62bd0ec0..6908271d2a 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -6,255 +6,1185 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("s") +@ObfuscatedName("l") public class class14 { - @ObfuscatedName("k") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; - @ObfuscatedName("ig") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2083803303 + intValue = -1849354153 ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("l") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Lkd;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1296080331 + intValue = -255968433 ) - final int field82; - @ObfuscatedName("q") - final String field79; - @ObfuscatedName("f") - final ThreadFactory field84; - @ObfuscatedName("j") - final ThreadPoolExecutor field81; + final int field65; + @ObfuscatedName("w") + final String field62; + @ObfuscatedName("s") + final ThreadFactory field68; + @ObfuscatedName("a") + final ThreadPoolExecutor field64; public class14(String var1, int var2, int var3) { - this.field79 = var1; - this.field82 = var2; - this.field84 = new class16(this); - this.field81 = this.method169(var3); - } + this.field62 = var1; // L: 15 + this.field65 = var2; // L: 16 + this.field68 = new class16(this); // L: 17 + this.field64 = this.method179(var3); // L: 18 + } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "1584843166" + garbageValue = "2016209231" ) - final ThreadPoolExecutor method169(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field82), this.field84); + final ThreadPoolExecutor method179(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field65), this.field68); // L: 22 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ly;I)Lz;", - garbageValue = "91554656" + descriptor = "(Lx;B)Ld;", + garbageValue = "-121" ) - public class19 method178(class10 var1) { - if (this.field81.getQueue().remainingCapacity() <= 0) { - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field81.getCorePoolSize() + " Queue capacity " + this.field82); - return new class19("Queue full"); + public class19 method187(class10 var1) { + if (this.field64.getQueue().remainingCapacity() <= 0) { // L: 26 + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field64.getCorePoolSize() + " Queue capacity " + this.field65); // L: 27 + return new class19("Queue full"); // L: 28 } else { - class19 var2 = new class19(this.field81.submit(new class20(this, var1))); - return var2; + class19 var2 = new class19(this.field64.submit(new class20(this, var1))); // L: 30 + return var2; // L: 31 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1427379154" + descriptor = "(B)V", + garbageValue = "35" ) - public final void method172() { + public final void method181() { try { - this.field81.shutdown(); - } catch (Exception var2) { - System.err.println("Error shutting down RestRequestService\r\n" + var2); + this.field64.shutdown(); // L: 36 + } catch (Exception var2) { // L: 38 + System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39 } - } + } // L: 41 - @ObfuscatedName("k") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-1312384098" + descriptor = "(ILbp;ZB)I", + garbageValue = "27" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { - int var3 = var0; - String var2; - if (var1 && var0 >= 0) { - int var4 = 2; - - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; - } - - char[] var6 = new char[var4]; - var6[0] = '+'; - - for (int var7 = var4 - 1; var7 > 0; --var7) { - int var8 = var3; - var3 /= 10; - int var9 = var8 - var3 * 10; - if (var9 >= 10) { - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); - } - } - - var2 = new String(var6); - } else { - var2 = Integer.toString(var0, 10); - } - - return var2; + static int method190(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 2831 + Interpreter_intStackSize -= 2; // L: 2832 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2833 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2834 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + var4; // L: 2835 + return 1; // L: 2836 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2838 + Interpreter_intStackSize -= 2; // L: 2839 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2840 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2841 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 - var4; // L: 2842 + return 1; // L: 2843 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2845 + Interpreter_intStackSize -= 2; // L: 2846 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2847 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2848 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 * var4; // L: 2849 + return 1; // L: 2850 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2852 + Interpreter_intStackSize -= 2; // L: 2853 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2854 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2855 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 / var4; // L: 2856 + return 1; // L: 2857 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2859 + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; // L: 2860 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2861 + return 1; // L: 2862 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2864 + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; // L: 2865 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2866 + return 1; // L: 2867 } else { - return Integer.toString(var0); + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2869 + Interpreter_intStackSize -= 5; // L: 2870 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2871 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2872 + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 2873 + var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; // L: 2874 + var7 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 4]; // L: 2875 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2876 + return 1; // L: 2877 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2879 + Interpreter_intStackSize -= 2; // L: 2880 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2881 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2882 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 2883 + return 1; // L: 2884 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2886 + Interpreter_intStackSize -= 2; // L: 2887 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2888 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2889 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2890 + return 1; // L: 2891 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2893 + Interpreter_intStackSize -= 2; // L: 2894 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2895 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2896 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2897 + return 1; // L: 2898 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2900 + Interpreter_intStackSize -= 2; // L: 2901 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2902 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2903 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2904 + return 1; // L: 2905 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2907 + Interpreter_intStackSize -= 2; // L: 2908 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2909 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2910 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 % var4; // L: 2911 + return 1; // L: 2912 + } else if (var0 == ScriptOpcodes.POW) { // L: 2914 + Interpreter_intStackSize -= 2; // L: 2915 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2916 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2917 + if (var3 == 0) { // L: 2918 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2919 + } + + return 1; // L: 2920 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2922 + Interpreter_intStackSize -= 2; // L: 2923 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2924 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2925 + if (var3 == 0) { // L: 2926 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; // L: 2927 + return 1; // L: 2928 + } else { + switch(var4) { // L: 2930 + case 0: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2943 + break; // L: 2944 + case 1: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; // L: 2958 + break; + case 2: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2933 + break; + case 3: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2953 + break; // L: 2954 + case 4: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2948 + break; // L: 2949 + default: + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2938 + } + + return 1; // L: 2962 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2964 + Interpreter_intStackSize -= 2; // L: 2965 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2966 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2967 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & var4; // L: 2968 + return 1; // L: 2969 + } else if (var0 == ScriptOpcodes.OR) { // L: 2971 + Interpreter_intStackSize -= 2; // L: 2972 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2973 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2974 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | var4; // L: 2975 + return 1; // L: 2976 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2978 + Interpreter_intStackSize -= 3; // L: 2979 + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2980 + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2981 + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 2982 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2983 + return 1; // L: 2984 + } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2986 + var3 = Tile.method4199(Interpreter.Interpreter_intStack[--Interpreter_intStackSize]); // L: 2987 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; // L: 2988 + return 1; // L: 2989 + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2991 + Interpreter_intStackSize -= 2; // L: 2992 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2993 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2994 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2995 + return 1; // L: 2996 + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2998 + Interpreter_intStackSize -= 3; // L: 2999 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3000 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3001 + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3002 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1162(var3, var4, var5); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3006 + Interpreter_intStackSize -= 3; // L: 3007 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3008 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3009 + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3010 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = MusicPatch.method4949(var3, var4, var5); // L: 3011 + return 1; // L: 3012 + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3014 + Interpreter_intStackSize -= 3; // L: 3015 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3016 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3017 + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3018 + var6 = 31 - var5; // L: 3019 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 3020 + return 1; // L: 3021 + } else if (var0 == 4030) { // L: 3023 + Interpreter_intStackSize -= 4; // L: 3024 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3025 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3026 + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3027 + var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; // L: 3028 + var3 = MusicPatch.method4949(var3, var5, var6); // L: 3029 + var7 = class123.method2619(var6 - var5 + 1); // L: 3030 + if (var4 > var7) { // L: 3031 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3032 + return 1; // L: 3033 + } else if (var0 == 4032) { // L: 3035 + Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = class269.method5190(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3036 + return 1; // L: 3037 + } else if (var0 == 4033) { // L: 3039 + Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = UserComparator6.method2512(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3040 + return 1; // L: 3041 + } else if (var0 == 4034) { // L: 3043 + Interpreter_intStackSize -= 2; // L: 3044 + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3045 + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3046 + var5 = Language.method5533(var3, var4); // L: 3047 + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; // L: 3048 + return 1; // L: 3049 + } else if (var0 == 4035) { // L: 3051 + Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3052 + return 1; // L: 3053 + } else { + return 2; // L: 3055 + } } } - @ObfuscatedName("k") + @ObfuscatedName("fs") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2085487227" + garbageValue = "-376967441" ) - static void method175() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (ScriptEvent.pcmPlayer1 != null) { // L: 4044 + ScriptEvent.pcmPlayer1.run(); } - } + if (HealthBar.pcmPlayer0 != null) { // L: 4045 + HealthBar.pcmPlayer0.run(); + } - @ObfuscatedName("c") + } // L: 4046 + + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "(Lhl;IIIB)Z", - garbageValue = "-89" + descriptor = "(Lcn;I)V", + garbageValue = "394697143" ) - static final boolean method179(Model var0, int var1, int var2, int var3) { - if (!GameEngine.method510()) { - return false; + static final void method180(PendingSpawn var0) { + long var1 = 0L; // L: 7499 + int var3 = -1; // L: 7500 + int var4 = 0; // L: 7501 + int var5 = 0; // L: 7502 + if (var0.type == 0) { // L: 7503 + var1 = GameBuild.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7504 + var1 = GameBuild.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7505 + var1 = GameBuild.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { // L: 7506 + var1 = GameBuild.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { // L: 7507 + int var6 = GameBuild.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7508 + var3 = class21.Entity_unpackID(var1); // L: 7509 + var4 = var6 & 31; // L: 7510 + var5 = var6 >> 6 & 3; // L: 7511 + } + + var0.objectId = var3; // L: 7513 + var0.field1076 = var4; // L: 7514 + var0.field1075 = var5; // L: 7515 + } // L: 7516 + + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-1644375573" + ) + @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: 8273 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 8274 + Client.mouseCrossX = var6; // L: 8717 + Client.mouseCrossY = var7; // L: 8718 + Client.mouseCrossColor = 2; // L: 8719 + Client.mouseCrossState = 0; // L: 8720 + Client.destinationX = var0; // L: 8721 + Client.destinationY = var1; // L: 8722 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2729, Client.packetWriter.isaacCipher); // L: 8724 + var8.packetBuffer.method7001(ReflectionCheck.selectedItemSlot); // L: 8725 + var8.packetBuffer.method7001(DefaultsGroup.baseY + var1); // L: 8726 + var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8727 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8728 + var8.packetBuffer.method7001(var3); // L: 8729 + var8.packetBuffer.method7003(SoundSystem.selectedItemId); // L: 8730 + var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8731 + Client.packetWriter.addNode(var8); // L: 8732 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8457 + Client.mouseCrossY = var7; // L: 8458 + Client.mouseCrossColor = 2; // L: 8459 + Client.mouseCrossState = 0; // L: 8460 + Client.destinationX = var0; // L: 8461 + Client.destinationY = var1; // L: 8462 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2738, Client.packetWriter.isaacCipher); // L: 8463 + var8.packetBuffer.method7126(FontName.selectedSpellWidget); // L: 8464 + var8.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8465 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8466 + var8.packetBuffer.method7001(Client.field627); // L: 8467 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8468 + var8.packetBuffer.method6962(var3); // L: 8469 + var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8470 + Client.packetWriter.addNode(var8); // L: 8471 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8894 + Client.mouseCrossY = var7; // L: 8895 + Client.mouseCrossColor = 2; // L: 8896 + Client.mouseCrossState = 0; // L: 8897 + Client.destinationX = var0; // L: 8898 + Client.destinationY = var1; // L: 8899 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2744, Client.packetWriter.isaacCipher); // L: 8901 + var8.packetBuffer.method7001(var0 + class19.baseX); // L: 8902 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8903 + var8.packetBuffer.method6962(var3); // L: 8904 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8905 + Client.packetWriter.addNode(var8); // L: 8906 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8955 + Client.mouseCrossY = var7; // L: 8956 + Client.mouseCrossColor = 2; // L: 8957 + Client.mouseCrossState = 0; // L: 8958 + Client.destinationX = var0; // L: 8959 + Client.destinationY = var1; // L: 8960 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 8962 + var8.packetBuffer.method7001(var0 + class19.baseX); // L: 8963 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8964 + var8.packetBuffer.writeShort(var3); // L: 8965 + var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8966 + Client.packetWriter.addNode(var8); // L: 8967 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8619 + Client.mouseCrossY = var7; // L: 8620 + Client.mouseCrossColor = 2; // L: 8621 + Client.mouseCrossState = 0; // L: 8622 + Client.destinationX = var0; // L: 8623 + Client.destinationY = var1; // L: 8624 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2690, Client.packetWriter.isaacCipher); // L: 8626 + var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8627 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8628 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8629 + var8.packetBuffer.method6962(var3); // L: 8630 + Client.packetWriter.addNode(var8); // L: 8631 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8317 + Client.mouseCrossY = var7; // L: 8318 + Client.mouseCrossColor = 2; // L: 8319 + Client.mouseCrossState = 0; // L: 8320 + Client.destinationX = var0; // L: 8321 + Client.destinationY = var1; // L: 8322 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2705, Client.packetWriter.isaacCipher); // L: 8324 + var8.packetBuffer.method7003(var3); // L: 8325 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8326 + var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8327 + var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8328 + Client.packetWriter.addNode(var8); // L: 8329 } else { - HealthBarUpdate.method2158(); - int var4 = var0.xMid + var1; - int var5 = var2 + var0.yMid; - int var6 = var3 + var0.zMid; - int var7 = var0.xMidOffset; - int var8 = var0.yMidOffset; - int var9 = var0.zMidOffset; - int var10 = class122.field1426 - var4; - int var11 = ViewportMouse.field2585 - var5; - int var12 = DirectByteArrayCopier.field3212 - var6; - if (Math.abs(var10) > var7 + Interpreter.field829) { - return false; - } else if (Math.abs(var11) > var8 + ViewportMouse.field2580) { - return false; - } else if (Math.abs(var12) > var9 + class19.field98) { - return false; - } else if (Math.abs(var12 * ViewportMouse.field2579 - var11 * class121.field1412) > var8 * class19.field98 + var9 * ViewportMouse.field2580) { - return false; - } else if (Math.abs(var10 * class121.field1412 - var12 * MilliClock.field1588) > var7 * class19.field98 + var9 * Interpreter.field829) { - return false; + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8383 + if (var13 != null) { // L: 8384 + Client.mouseCrossX = var6; // L: 8385 + Client.mouseCrossY = var7; // L: 8386 + Client.mouseCrossColor = 2; // L: 8387 + Client.mouseCrossState = 0; // L: 8388 + Client.destinationX = var0; // L: 8389 + Client.destinationY = var1; // L: 8390 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2722, Client.packetWriter.isaacCipher); // L: 8392 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8393 + var9.packetBuffer.method6962(SoundSystem.selectedItemId); // L: 8394 + var9.packetBuffer.method7001(ReflectionCheck.selectedItemSlot); // L: 8395 + var9.packetBuffer.method7126(MouseHandler.selectedItemWidget); // L: 8396 + var9.packetBuffer.method7003(var3); // L: 8397 + Client.packetWriter.addNode(var9); // L: 8398 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8876 + if (var13 != null) { // L: 8877 + Client.mouseCrossX = var6; // L: 8878 + Client.mouseCrossY = var7; // L: 8879 + Client.mouseCrossColor = 2; // L: 8880 + Client.mouseCrossState = 0; // L: 8881 + Client.destinationX = var0; // L: 8882 + Client.destinationY = var1; // L: 8883 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2741, Client.packetWriter.isaacCipher); // L: 8884 + var9.packetBuffer.writeIntME(FontName.selectedSpellWidget); // L: 8885 + var9.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8886 + var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8887 + var9.packetBuffer.method6962(var3); // L: 8888 + var9.packetBuffer.writeShort(Client.field627); // L: 8889 + Client.packetWriter.addNode(var9); // L: 8890 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8603 + if (var13 != null) { // L: 8604 + Client.mouseCrossX = var6; // L: 8605 + Client.mouseCrossY = var7; // L: 8606 + Client.mouseCrossColor = 2; // L: 8607 + Client.mouseCrossState = 0; // L: 8608 + Client.destinationX = var0; // L: 8609 + Client.destinationY = var1; // L: 8610 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2717, Client.packetWriter.isaacCipher); // L: 8612 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8613 + var9.packetBuffer.method7001(var3); // L: 8614 + Client.packetWriter.addNode(var9); // L: 8615 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 9022 + if (var13 != 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 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2748, Client.packetWriter.isaacCipher); // L: 9031 + var9.packetBuffer.method7001(var3); // L: 9032 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9033 + Client.packetWriter.addNode(var9); // L: 9034 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8833 + if (var13 != null) { // L: 8834 + Client.mouseCrossX = var6; // L: 8835 + Client.mouseCrossY = var7; // L: 8836 + Client.mouseCrossColor = 2; // L: 8837 + Client.mouseCrossState = 0; // L: 8838 + Client.destinationX = var0; // L: 8839 + Client.destinationY = var1; // L: 8840 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2723, Client.packetWriter.isaacCipher); // L: 8842 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8843 + var9.packetBuffer.method6962(var3); // L: 8844 + Client.packetWriter.addNode(var9); // L: 8845 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8518 + if (var13 != null) { // L: 8519 + Client.mouseCrossX = var6; // L: 8520 + Client.mouseCrossY = var7; // L: 8521 + Client.mouseCrossColor = 2; // L: 8522 + Client.mouseCrossState = 0; // L: 8523 + Client.destinationX = var0; // L: 8524 + Client.destinationY = var1; // L: 8525 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2730, Client.packetWriter.isaacCipher); // L: 8527 + var9.packetBuffer.method7001(var3); // L: 8528 + var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8529 + Client.packetWriter.addNode(var9); // L: 8530 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8634 + if (var13 != null) { // L: 8635 + Client.mouseCrossX = var6; // L: 8636 + Client.mouseCrossY = var7; // L: 8637 + Client.mouseCrossColor = 2; // L: 8638 + Client.mouseCrossState = 0; // L: 8639 + Client.destinationX = var0; // L: 8640 + Client.destinationY = var1; // L: 8641 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 8643 + var9.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8644 + var9.packetBuffer.writeShort(var3); // L: 8645 + Client.packetWriter.addNode(var9); // L: 8646 + } } else { - return Math.abs(var11 * MilliClock.field1588 - var10 * ViewportMouse.field2579) <= var7 * ViewportMouse.field2580 + var8 * Interpreter.field829; - } - } - } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(ZLoy;I)V", - garbageValue = "2078480474" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field611 = 0; - Client.field713 = 0; - PacketBuffer var2 = Client.packetWriter.packetBuffer; - var2.importIndex(); - int var3 = var2.readBits(8); - int var4; - if (var3 < Client.npcCount) { - for (var4 = var3; var4 < Client.npcCount; ++var4) { - Client.field612[++Client.field611 - 1] = Client.npcIndices[var4]; - } - } - - if (var3 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var4 = 0; var4 < var3; ++var4) { - int var5 = Client.npcIndices[var4]; - NPC var6 = Client.npcs[var5]; - int var7 = var2.readBits(1); - if (var7 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - } else { - int var8 = var2.readBits(2); - if (var8 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - Client.field535[++Client.field713 - 1] = var5; + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8792 + if (var15 != null) { // L: 8793 + Client.mouseCrossX = var6; // L: 8794 + Client.mouseCrossY = var7; // L: 8795 + Client.mouseCrossColor = 2; // L: 8796 + Client.mouseCrossState = 0; // L: 8797 + Client.destinationX = var0; // L: 8798 + Client.destinationY = var1; // L: 8799 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8801 + var9.packetBuffer.method6962(var3); // L: 8802 + var9.packetBuffer.method6962(SoundSystem.selectedItemId); // L: 8803 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8804 + var9.packetBuffer.method6962(ReflectionCheck.selectedItemSlot); // L: 8805 + var9.packetBuffer.writeIntME(MouseHandler.selectedItemWidget); // L: 8806 + Client.packetWriter.addNode(var9); // L: 8807 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8751 + if (var15 != null) { // L: 8752 + Client.mouseCrossX = var6; // L: 8753 + Client.mouseCrossY = var7; // L: 8754 + Client.mouseCrossColor = 2; // L: 8755 + Client.mouseCrossState = 0; // L: 8756 + Client.destinationX = var0; // L: 8757 + Client.destinationY = var1; // L: 8758 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2760, Client.packetWriter.isaacCipher); // L: 8759 + var9.packetBuffer.method6962(Client.field627); // L: 8760 + var9.packetBuffer.method7003(var3); // L: 8761 + var9.packetBuffer.method7003(Client.selectedSpellChildIndex); // L: 8762 + var9.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8763 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8764 + Client.packetWriter.addNode(var9); // L: 8765 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8699 + Client.mouseCrossY = var7; // L: 8700 + Client.mouseCrossColor = 2; // L: 8701 + Client.mouseCrossState = 0; // L: 8702 + Client.destinationX = var0; // L: 8703 + Client.destinationY = var1; // L: 8704 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2756, Client.packetWriter.isaacCipher); // L: 8706 + var8.packetBuffer.method7003(var3); // L: 8707 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8708 + var8.packetBuffer.writeShort(SoundSystem.selectedItemId); // L: 8709 + var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8710 + var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8711 + var8.packetBuffer.method7003(ReflectionCheck.selectedItemSlot); // L: 8712 + var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8713 + Client.packetWriter.addNode(var8); // L: 8714 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8650 + Client.mouseCrossY = var7; // L: 8651 + Client.mouseCrossColor = 2; // L: 8652 + Client.mouseCrossState = 0; // L: 8653 + Client.destinationX = var0; // L: 8654 + Client.destinationY = var1; // L: 8655 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2735, Client.packetWriter.isaacCipher); // L: 8656 + var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8657 + var8.packetBuffer.method7003(Client.field627); // L: 8658 + var8.packetBuffer.method6962(var3); // L: 8659 + var8.packetBuffer.method7001(DefaultsGroup.baseY + var1); // L: 8660 + var8.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8661 + var8.packetBuffer.method7001(Client.selectedSpellChildIndex); // L: 8662 + var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8663 + Client.packetWriter.addNode(var8); // L: 8664 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8487 + Client.mouseCrossY = var7; // L: 8488 + Client.mouseCrossColor = 2; // L: 8489 + Client.mouseCrossState = 0; // L: 8490 + Client.destinationX = var0; // L: 8491 + Client.destinationY = var1; // L: 8492 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2701, Client.packetWriter.isaacCipher); // L: 8494 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8495 + var8.packetBuffer.writeShort(var3); // L: 8496 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8497 + var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8498 + Client.packetWriter.addNode(var8); // L: 8499 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8909 + Client.mouseCrossY = var7; // L: 8910 + Client.mouseCrossColor = 2; // L: 8911 + Client.mouseCrossState = 0; // L: 8912 + Client.destinationX = var0; // L: 8913 + Client.destinationY = var1; // L: 8914 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2768, Client.packetWriter.isaacCipher); // L: 8916 + var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8917 + var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8918 + var8.packetBuffer.method7001(var3); // L: 8919 + var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8920 + Client.packetWriter.addNode(var8); // L: 8921 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8431 + Client.mouseCrossY = var7; // L: 8432 + Client.mouseCrossColor = 2; // L: 8433 + Client.mouseCrossState = 0; // L: 8434 + Client.destinationX = var0; // L: 8435 + Client.destinationY = var1; // L: 8436 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher); // L: 8438 + var8.packetBuffer.method6962(DefaultsGroup.baseY + var1); // L: 8439 + var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8440 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8441 + var8.packetBuffer.method6962(var3); // L: 8442 + Client.packetWriter.addNode(var8); // L: 8443 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8402 + Client.mouseCrossY = var7; // L: 8403 + Client.mouseCrossColor = 2; // L: 8404 + Client.mouseCrossState = 0; // L: 8405 + Client.destinationX = var0; // L: 8406 + Client.destinationY = var1; // L: 8407 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2763, Client.packetWriter.isaacCipher); // L: 8409 + var8.packetBuffer.method6962(DefaultsGroup.baseY + var1); // L: 8410 + var8.packetBuffer.writeShort(var3); // L: 8411 + var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8412 + var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8413 + Client.packetWriter.addNode(var8); // L: 8414 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8302 + Client.mouseCrossY = var7; // L: 8303 + Client.mouseCrossColor = 2; // L: 8304 + Client.mouseCrossState = 0; // L: 8305 + Client.destinationX = var0; // L: 8306 + Client.destinationY = var1; // L: 8307 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2767, Client.packetWriter.isaacCipher); // L: 8309 + var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8310 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8311 + var8.packetBuffer.method7003(var3); // L: 8312 + var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8313 + Client.packetWriter.addNode(var8); // L: 8314 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8362 + GameBuild.scene.setViewportWalking(); // L: 8363 } else { - int var9; - int var10; - if (var8 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var6.method2223(var9, (byte)1); - var10 = var2.readBits(1); - if (var10 == 1) { - Client.field535[++Client.field713 - 1] = var5; + GameBuild.scene.menuOpen(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1, true); // L: 8366 + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = UserComparator9.getWidget(var1); // L: 8937 + boolean var12 = true; // L: 8938 + if (var16.contentType > 0) { // L: 8939 + var12 = GrandExchangeOfferAgeComparator.method5423(var16); + } + + if (var12) { // L: 8940 + var11 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8942 + var11.packetBuffer.writeInt(var1); // L: 8943 + Client.packetWriter.addNode(var11); // L: 8944 + } + } else { + if (var2 == 25) { + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8924 + if (var16 != null) { // L: 8925 + class262.Widget_runOnTargetLeave(); // L: 8926 + Decimator.selectSpell(var1, var0, SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var16)), var16.itemId); // L: 8927 + Client.isItemSelected = 0; // L: 8928 + Client.selectedSpellActionName = class20.Widget_getSpellActionName(var16); // L: 8929 + if (Client.selectedSpellActionName == null) { // L: 8930 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8931 + Client.selectedSpellName = var16.dataText + MouseHandler.colorStartTag(16777215); + } else { + Client.selectedSpellName = MouseHandler.colorStartTag(65280) + var16.spellName + MouseHandler.colorStartTag(16777215); // L: 8932 + } } - } else if (var8 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var6.method2223(var9, (byte)2); - var10 = var2.readBits(3); - var6.method2223(var10, (byte)2); - int var11 = var2.readBits(1); - if (var11 == 1) { - Client.field535[++Client.field713 - 1] = var5; + + return; // L: 8934 + } + + if (var2 == 26) { + method191(); // L: 8359 + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8781 + var8.packetBuffer.writeInt(var1); // L: 8782 + Client.packetWriter.addNode(var8); // L: 8783 + var14 = UserComparator9.getWidget(var1); // L: 8784 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8785 + var10 = var14.cs1Instructions[0][1]; // L: 8786 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8787 + WorldMapLabelSize.changeGameOptions(var10); // L: 8788 + } + } else if (var2 == 29) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8418 + var8.packetBuffer.writeInt(var1); // L: 8419 + Client.packetWriter.addNode(var8); // L: 8420 + var14 = UserComparator9.getWidget(var1); // L: 8421 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8422 + var10 = var14.cs1Instructions[0][1]; // L: 8423 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8424 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8425 + WorldMapLabelSize.changeGameOptions(var10); // L: 8426 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8948 + class92.resumePauseWidget(var1, var0); // L: 8949 + Client.meslayerContinueWidget = ItemContainer.getWidgetChild(var1, var0); // L: 8950 + class184.invalidateWidget(Client.meslayerContinueWidget); // L: 8951 + } + } else if (var2 == 31) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2702, Client.packetWriter.isaacCipher); // L: 8971 + var8.packetBuffer.method6962(var3); // L: 8972 + var8.packetBuffer.method7010(var1); // L: 8973 + var8.packetBuffer.writeShort(var0); // L: 8974 + var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8975 + var8.packetBuffer.method7003(SoundSystem.selectedItemId); // L: 8976 + var8.packetBuffer.method6962(ReflectionCheck.selectedItemSlot); // L: 8977 + Client.packetWriter.addNode(var8); // L: 8978 + Client.field576 = 0; // L: 8979 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8980 + Client.field577 = var0; // L: 8981 + } else if (var2 == 32) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher); // L: 9039 + var8.packetBuffer.method7003(var0); // L: 9040 + var8.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 9041 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9042 + var8.packetBuffer.method7010(var1); // L: 9043 + var8.packetBuffer.method6962(var3); // L: 9044 + Client.packetWriter.addNode(var8); // L: 9045 + Client.field576 = 0; // L: 9046 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9047 + Client.field577 = var0; // L: 9048 + } else if (var2 == 33) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2706, Client.packetWriter.isaacCipher); // L: 8546 + var8.packetBuffer.method7003(var3); // L: 8547 + var8.packetBuffer.method7001(var0); // L: 8548 + var8.packetBuffer.writeIntME(var1); // L: 8549 + Client.packetWriter.addNode(var8); // L: 8550 + Client.field576 = 0; // L: 8551 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8552 + Client.field577 = var0; // L: 8553 + } else if (var2 == 34) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher); // L: 8276 + var8.packetBuffer.method6962(var3); // L: 8277 + var8.packetBuffer.method6962(var0); // L: 8278 + var8.packetBuffer.writeIntME(var1); // L: 8279 + Client.packetWriter.addNode(var8); // L: 8280 + Client.field576 = 0; // L: 8281 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8282 + Client.field577 = var0; // L: 8283 + } else if (var2 == 35) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 9001 + var8.packetBuffer.method7003(var3); // L: 9002 + var8.packetBuffer.method6962(var0); // L: 9003 + var8.packetBuffer.writeIntME(var1); // L: 9004 + Client.packetWriter.addNode(var8); // L: 9005 + Client.field576 = 0; // L: 9006 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9007 + Client.field577 = var0; // L: 9008 + } else if (var2 == 36) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8689 + var8.packetBuffer.method7003(var3); // L: 8690 + var8.packetBuffer.method7001(var0); // L: 8691 + var8.packetBuffer.method7126(var1); // L: 8692 + Client.packetWriter.addNode(var8); // L: 8693 + Client.field576 = 0; // L: 8694 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8695 + Client.field577 = var0; // L: 8696 + } else if (var2 == 37) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2731, Client.packetWriter.isaacCipher); // L: 8535 + var8.packetBuffer.method6962(var0); // L: 8536 + var8.packetBuffer.writeShort(var3); // L: 8537 + var8.packetBuffer.method7010(var1); // L: 8538 + Client.packetWriter.addNode(var8); // L: 8539 + Client.field576 = 0; // L: 8540 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8541 + Client.field577 = var0; // L: 8542 + } else { + if (var2 == 38) { + class262.Widget_runOnTargetLeave(); // L: 8849 + var16 = UserComparator9.getWidget(var1); // L: 8850 + Client.isItemSelected = 1; // L: 8851 + ReflectionCheck.selectedItemSlot = var0; // L: 8852 + MouseHandler.selectedItemWidget = var1; // L: 8853 + SoundSystem.selectedItemId = var3; // L: 8854 + class184.invalidateWidget(var16); // L: 8855 + Client.selectedItemName = MouseHandler.colorStartTag(16748608) + TaskHandler.ItemDefinition_get(var3).name + MouseHandler.colorStartTag(16777215); // L: 8856 + if (Client.selectedItemName == null) { // L: 8857 + Client.selectedItemName = "null"; + } + + return; // L: 8858 + } + + if (var2 == 39) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2691, Client.packetWriter.isaacCipher); // L: 8770 + var8.packetBuffer.method7001(var3); // L: 8771 + var8.packetBuffer.writeShort(var0); // L: 8772 + var8.packetBuffer.writeInt(var1); // L: 8773 + Client.packetWriter.addNode(var8); // L: 8774 + Client.field576 = 0; // L: 8775 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8776 + Client.field577 = var0; // L: 8777 + } else if (var2 == 40) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 9012 + var8.packetBuffer.writeInt(var1); // L: 9013 + var8.packetBuffer.writeShort(var3); // L: 9014 + var8.packetBuffer.method7001(var0); // L: 9015 + Client.packetWriter.addNode(var8); // L: 9016 + Client.field576 = 0; // L: 9017 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9018 + Client.field577 = var0; // L: 9019 + } else if (var2 == 41) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher); // L: 8447 + var8.packetBuffer.writeIntME(var1); // L: 8448 + var8.packetBuffer.method7003(var0); // L: 8449 + var8.packetBuffer.writeShort(var3); // L: 8450 + Client.packetWriter.addNode(var8); // L: 8451 + Client.field576 = 0; // L: 8452 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8453 + Client.field577 = var0; // L: 8454 + } else if (var2 == 42) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 8668 + var8.packetBuffer.writeShort(var3); // L: 8669 + var8.packetBuffer.writeIntME(var1); // L: 8670 + var8.packetBuffer.writeShort(var0); // L: 8671 + Client.packetWriter.addNode(var8); // L: 8672 + Client.field576 = 0; // L: 8673 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8674 + Client.field577 = var0; // L: 8675 + } else if (var2 == 43) { + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2694, Client.packetWriter.isaacCipher); // L: 8349 + var8.packetBuffer.writeInt(var1); // L: 8350 + var8.packetBuffer.writeShort(var0); // L: 8351 + var8.packetBuffer.method7003(var3); // L: 8352 + Client.packetWriter.addNode(var8); // L: 8353 + Client.field576 = 0; // L: 8354 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8355 + Client.field577 = var0; // L: 8356 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8502 + if (var15 != null) { // L: 8503 + Client.mouseCrossX = var6; // L: 8504 + Client.mouseCrossY = var7; // L: 8505 + Client.mouseCrossColor = 2; // L: 8506 + Client.mouseCrossState = 0; // L: 8507 + Client.destinationX = var0; // L: 8508 + Client.destinationY = var1; // L: 8509 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); // L: 8511 + var9.packetBuffer.writeShort(var3); // L: 8512 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8513 + Client.packetWriter.addNode(var9); // L: 8514 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8332 + if (var15 != null) { // L: 8333 + Client.mouseCrossX = var6; // L: 8334 + Client.mouseCrossY = var7; // L: 8335 + Client.mouseCrossColor = 2; // L: 8336 + Client.mouseCrossState = 0; // L: 8337 + Client.destinationX = var0; // L: 8338 + Client.destinationY = var1; // L: 8339 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2687, Client.packetWriter.isaacCipher); // L: 8341 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8342 + var9.packetBuffer.method6962(var3); // L: 8343 + Client.packetWriter.addNode(var9); // L: 8344 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 9051 + if (var15 != null) { // L: 9052 + Client.mouseCrossX = var6; // L: 9053 + Client.mouseCrossY = var7; // L: 9054 + Client.mouseCrossColor = 2; // L: 9055 + Client.mouseCrossState = 0; // L: 9056 + Client.destinationX = var0; // L: 9057 + Client.destinationY = var1; // L: 9058 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2710, Client.packetWriter.isaacCipher); // L: 9060 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9061 + var9.packetBuffer.writeShort(var3); // L: 9062 + Client.packetWriter.addNode(var9); // L: 9063 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 8984 + if (var15 != null) { // L: 8985 + Client.mouseCrossX = var6; // L: 8986 + Client.mouseCrossY = var7; // L: 8987 + Client.mouseCrossColor = 2; // L: 8988 + Client.mouseCrossState = 0; // L: 8989 + Client.destinationX = var0; // L: 8990 + Client.destinationY = var1; // L: 8991 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2769, Client.packetWriter.isaacCipher); // L: 8993 + var9.packetBuffer.method6962(var3); // L: 8994 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8995 + Client.packetWriter.addNode(var9); // L: 8996 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8556 + if (var15 != null) { // L: 8557 + Client.mouseCrossX = var6; // L: 8558 + Client.mouseCrossY = var7; // L: 8559 + Client.mouseCrossColor = 2; // L: 8560 + Client.mouseCrossState = 0; // L: 8561 + Client.destinationX = var0; // L: 8562 + Client.destinationY = var1; // L: 8563 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2692, Client.packetWriter.isaacCipher); // L: 8565 + var9.packetBuffer.method7003(var3); // L: 8566 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8567 + Client.packetWriter.addNode(var9); // L: 8568 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8286 + if (var15 != null) { // L: 8287 + Client.mouseCrossX = var6; // L: 8288 + Client.mouseCrossY = var7; // L: 8289 + Client.mouseCrossColor = 2; // L: 8290 + Client.mouseCrossState = 0; // L: 8291 + Client.destinationX = var0; // L: 8292 + Client.destinationY = var1; // L: 8293 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); // L: 8295 + var9.packetBuffer.method7001(var3); // L: 8296 + var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8297 + Client.packetWriter.addNode(var9); // L: 8298 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8817 + if (var15 != null) { // L: 8818 + Client.mouseCrossX = var6; // L: 8819 + Client.mouseCrossY = var7; // L: 8820 + Client.mouseCrossColor = 2; // L: 8821 + Client.mouseCrossState = 0; // L: 8822 + Client.destinationX = var0; // L: 8823 + Client.destinationY = var1; // L: 8824 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8826 + var9.packetBuffer.writeShort(var3); // L: 8827 + var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8828 + Client.packetWriter.addNode(var9); // L: 8829 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8735 + if (var15 != null) { // L: 8736 + Client.mouseCrossX = var6; // L: 8737 + Client.mouseCrossY = var7; // L: 8738 + Client.mouseCrossColor = 2; // L: 8739 + Client.mouseCrossState = 0; // L: 8740 + Client.destinationX = var0; // L: 8741 + Client.destinationY = var1; // L: 8742 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2728, Client.packetWriter.isaacCipher); // L: 8744 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8745 + var9.packetBuffer.method7003(var3); // L: 8746 + Client.packetWriter.addNode(var9); // L: 8747 + } + } else { + label646: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8572 + if (var16 != null) { // L: 8573 + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2753, Client.packetWriter.isaacCipher); // L: 8575 + var9.packetBuffer.method6962(var16.itemId); // L: 8576 + var9.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8577 + var9.packetBuffer.method6962(var0); // L: 8578 + var9.packetBuffer.writeInt(var1); // L: 8579 + var9.packetBuffer.method6962(Client.field627); // L: 8580 + var9.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8581 + Client.packetWriter.addNode(var9); // L: 8582 + } + break label646; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8861 + Client.mouseCrossY = var7; // L: 8862 + Client.mouseCrossColor = 2; // L: 8863 + Client.mouseCrossState = 0; // L: 8864 + Client.destinationX = var0; // L: 8865 + Client.destinationY = var1; // L: 8866 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2693, Client.packetWriter.isaacCipher); // L: 8868 + var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8869 + var8.packetBuffer.method7003(var3); // L: 8870 + var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8871 + var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8872 + Client.packetWriter.addNode(var8); // L: 8873 + break label646; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8678 + Client.mouseCrossY = var7; // L: 8679 + Client.mouseCrossColor = 2; // L: 8680 + Client.mouseCrossState = 0; // L: 8681 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2697, Client.packetWriter.isaacCipher); // L: 8683 + var8.packetBuffer.method7001(var3); // L: 8684 + Client.packetWriter.addNode(var8); // L: 8685 + break label646; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8586 + Client.mouseCrossY = var7; // L: 8587 + Client.mouseCrossColor = 2; // L: 8588 + Client.mouseCrossState = 0; // L: 8589 + var13 = Client.npcs[var3]; // L: 8590 + if (var13 != null) { // L: 8591 + NPCComposition var17 = var13.definition; // L: 8592 + if (var17.transforms != null) { // L: 8593 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8594 + var11 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2757, Client.packetWriter.isaacCipher); // L: 8596 + var11.packetBuffer.writeShort(var17.id); // L: 8597 + Client.packetWriter.addNode(var11); // L: 8598 + } + } + break label646; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8373 + Client.mouseCrossY = var7; // L: 8374 + Client.mouseCrossColor = 2; // L: 8375 + Client.mouseCrossState = 0; // L: 8376 + var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2755, Client.packetWriter.isaacCipher); // L: 8378 + var8.packetBuffer.method7003(var3); // L: 8379 + Client.packetWriter.addNode(var8); // L: 8380 + break label646; + } + + if (var2 == 1005) { + var16 = UserComparator9.getWidget(var1); // L: 8474 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8475 + class397.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + TaskHandler.ItemDefinition_get(var3).name); + } else { + var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2755, Client.packetWriter.isaacCipher); // L: 8478 + var9.packetBuffer.method7003(var3); // L: 8479 + Client.packetWriter.addNode(var9); // L: 8480 + } + + Client.field576 = 0; // L: 8482 + WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8483 + Client.field577 = var0; // L: 8484 + break label646; + } + + if (var2 != 1007) { + if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) { + class133.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8370 + } + break label646; + } + } + + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8811 + if (var16 != null) { // L: 8812 + GrandExchangeEvents.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8813 + } + } + } } - } else if (var8 == 3) { - Client.field612[++Client.field611 - 1] = var5; } } } } + } - MidiPcmStream.method4806(var0, var1); - class318.method5839(var1); + if (Client.isItemSelected != 0) { // L: 9066 + Client.isItemSelected = 0; // L: 9067 + class184.invalidateWidget(UserComparator9.getWidget(MouseHandler.selectedItemWidget)); // L: 9068 + } - int var12; - for (var12 = 0; var12 < Client.field611; ++var12) { - var3 = Client.field612[var12]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } + if (Client.isSpellSelected) { // L: 9070 + class262.Widget_runOnTargetLeave(); + } + + if (WorldMapSection2.field2037 != null && Client.field576 == 0) { // L: 9071 + class184.invalidateWidget(WorldMapSection2.field2037); + } + + } // L: 9072 + + @ObfuscatedName("kg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2112486118" + ) + static final void method178(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 11376 + if (var0 != class408.clientPreferences.musicVolume) { // L: 11377 + if (class408.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11378 + Archive var1 = Messages.archive6; // L: 11379 + int var2 = Client.currentTrackGroupId; // L: 11380 + class247.musicPlayerStatus = 1; // L: 11382 + class128.musicTrackArchive = var1; // L: 11383 + FillMode.musicTrackGroupId = var2; // L: 11384 + ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 11385 + class247.musicTrackVolume = var0; // L: 11386 + SecureRandomCallable.musicTrackBoolean = false; // L: 11387 + class247.pcmSampleLength = 10000; // L: 11388 + Client.field710 = false; // L: 11390 + } else if (var0 == 0) { // L: 11392 + WorldMapCacheName.method4027(); // L: 11393 + Client.field710 = false; // L: 11394 + } else { + WorldMapSection0.method3917(var0); // L: 11396 } - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var12 = 0; var12 < Client.npcCount; ++var12) { - if (Client.npcs[Client.npcIndices[var12]] == null) { - throw new RuntimeException(var12 + "," + Client.npcCount); - } - } + class408.clientPreferences.musicVolume = var0; // L: 11397 + Login.savePreferences(); // L: 11398 + } + } // L: 11400 + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1351549041" + ) + static final void method191() { + PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher); // L: 11505 + Client.packetWriter.addNode(var0); // L: 11506 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11507 + if (var1.type == 0 || var1.type == 3) { // L: 11508 + Players.closeInterface(var1, true); } } - } + + if (Client.meslayerContinueWidget != null) { // L: 11510 + class184.invalidateWidget(Client.meslayerContinueWidget); // L: 11511 + Client.meslayerContinueWidget = null; // L: 11512 + } + + } // L: 11514 } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index 12b824a9b7..b9dc78c4de 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -2,18 +2,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("et") public class class140 extends class116 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 745806175 + intValue = 1541912545 ) - int field1542; - @ObfuscatedName("q") + int field1536; + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 5393161811926100225L + longValue = -8264772663538436025L ) - long field1539; + long field1531; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Ldg;" @@ -24,34 +24,25 @@ public class class140 extends class116 { descriptor = "(Ldg;)V" ) class140(class119 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 307 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "-912681401" + descriptor = "(Lop;I)V", + garbageValue = "-2002779676" ) - void vmethod2767(Buffer var1) { - this.field1542 = var1.readInt(); - this.field1539 = var1.readLong(); - } + void vmethod2847(Buffer var1) { + this.field1536 = var1.readInt(); // L: 310 + this.field1531 = var1.readLong(); // L: 311 + } // L: 312 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldk;I)V", - garbageValue = "-1225074726" + descriptor = "(Ldm;I)V", + garbageValue = "-293908864" ) - void vmethod2766(ClanSettings var1) { - var1.method2599(this.field1542, this.field1539); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "28594" - ) - public static int method2770(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; - } + void vmethod2848(ClanSettings var1) { + var1.method2666(this.field1536, this.field1531); // L: 315 + } // L: 316 } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index bb95386ef8..a927ded248 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("eg") public interface class144 { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "459838731" + garbageValue = "-1160529550" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index fac8c0e9f1..4e9a254d48 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -12,65 +12,65 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("c") +@ObfuscatedName("u") public class class15 extends SSLSocketFactory { - @ObfuscatedName("l") - SecureRandom field86; + @ObfuscatedName("i") + SecureRandom field70; static { - if (Security.getProvider("BC") == null) { + if (Security.getProvider("BC") == null) { // L: 40 Security.addProvider(new BouncyCastleProvider()); } - } + } // L: 41 class15() { - this.field86 = new SecureRandom(); - } + this.field70 = new SecureRandom(); // L: 43 + } // L: 45 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", - garbageValue = "-1206486278" + garbageValue = "-115547208" ) - SSLSocket method201(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); + SSLSocket method197(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); // L: 83 } public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { - if (var1 == null) { - var1 = new Socket(); + if (var1 == null) { // L: 48 + var1 = new Socket(); // L: 49 } - if (!var1.isConnected()) { - var1.connect(new InetSocketAddress(var2, var3)); + if (!var1.isConnected()) { // L: 51 + var1.connect(new InetSocketAddress(var2, var3)); // L: 52 } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field86); - return this.method201(var2, var5); + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field70); // L: 54 + return this.method197(var2, var5); // L: 55 } public String[] getDefaultCipherSuites() { - return null; - } - - public String[] getSupportedCipherSuites() { - return null; + return null; // L: 59 } public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; + return null; // L: 67 } public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; - } - - public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; + return null; // L: 75 } public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; + return null; // L: 71 + } + + public String[] getSupportedCipherSuites() { + return null; // L: 63 + } + + public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { + return null; // L: 79 } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index 68e742ed2e..704a8c66d5 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -1,71 +1,125 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("ey") public class class150 { - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "Lky;" + @ObfuscatedName("os") + @ObfuscatedGetter( + intValue = 341290279 ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("f") - public short[] field1606; - @ObfuscatedName("j") - public short[] field1607; + static int field1604; + @ObfuscatedName("s") + public short[] field1598; + @ObfuscatedName("a") + public short[] field1600; - public class150(int var1) { - ItemComposition var2 = class87.ItemDefinition_get(var1); - if (var2.method3297()) { - this.field1606 = new short[var2.recolorTo.length]; - System.arraycopy(var2.recolorTo, 0, this.field1606, 0, this.field1606.length); + class150(int var1) { + ItemComposition var2 = TaskHandler.ItemDefinition_get(var1); // L: 12 + if (var2.method3368()) { // L: 13 + this.field1598 = new short[var2.recolorTo.length]; + System.arraycopy(var2.recolorTo, 0, this.field1598, 0, this.field1598.length); // L: 15 } - if (var2.method3272()) { - this.field1607 = new short[var2.retextureTo.length]; - System.arraycopy(var2.retextureTo, 0, this.field1607, 0, this.field1607.length); + if (var2.method3347()) { // L: 17 + this.field1600 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1600, 0, this.field1600.length); // L: 19 } + } // L: 21 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Lfg;", + garbageValue = "-639525716" + ) + static VerticalAlignment[] method2969() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1744, VerticalAlignment.field1743}; // L: 14 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I[BLmm;I)V", - garbageValue = "-2027548425" + descriptor = "(IB)Lfy;", + garbageValue = "5" ) - static void method2873(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 0; - var3.key = (long)var0; - var3.data = var1; - var3.archiveDisk = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3671 == 0) { - Huffman.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - Huffman.ArchiveDiskActionHandler_thread.setDaemon(true); - Huffman.ArchiveDiskActionHandler_thread.start(); - Huffman.ArchiveDiskActionHandler_thread.setPriority(5); + public static VarbitComposition method2965(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; + } else { + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 34 + var1 = new VarbitComposition(); // L: 35 + if (var2 != null) { // L: 36 + var1.decode(new Buffer(var2)); } - ArchiveDiskActionHandler.field3671 = 600; + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 37 + return var1; // L: 38 } } - @ObfuscatedName("j") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "893646599" + descriptor = "(III)I", + garbageValue = "1306272035" ) - static void method2874(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); - if (var4 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var4); + static int method2971(int var0, int var1) { + int var2 = var1 - 334; // L: 5656 + if (var2 < 0) { // L: 5657 + var2 = 0; + } else if (var2 > 100) { // L: 5658 + var2 = 100; } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5659 + return var0 * var3 / 256; // L: 5660 } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "([Ljf;IB)V", + garbageValue = "-37" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11126 + Widget var3 = var0[var2]; // L: 11127 + if (var3 != null) { // L: 11128 + if (var3.type == 0) { // L: 11129 + if (var3.children != null) { // L: 11130 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11131 + if (var4 != null) { // L: 11132 + ItemComposition.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 11134 + var5 = new ScriptEvent(); // L: 11135 + var5.widget = var3; // L: 11136 + var5.args = var3.onDialogAbort; // L: 11137 + Tile.runScriptEvent(var5); // L: 11138 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 11140 + if (var3.childIndex >= 0) { // L: 11141 + Widget var6 = UserComparator9.getWidget(var3.id); // L: 11142 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11143 + continue; + } + } + + var5 = new ScriptEvent(); // L: 11147 + var5.widget = var3; // L: 11148 + var5.args = var3.onSubChange; // L: 11149 + Tile.runScriptEvent(var5); // L: 11150 + } + } + } + + } // L: 11153 } diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java index afb2378596..7f86e0fc3c 100644 --- a/runescape-client/src/main/java/class157.java +++ b/runescape-client/src/main/java/class157.java @@ -1,107 +1,39 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fa") public class class157 { - @ObfuscatedName("a") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkl;B)V", - garbageValue = "-40" + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -720969089 ) - public static void method2982(AbstractArchive var0) { - ParamComposition.StructDefinition_archive = var0; + static int field1675; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Ljd;", + garbageValue = "1047371147" + ) + public static StudioGame[] method3084() { + return new StudioGame[]{StudioGame.game5, StudioGame.stellardawn, StudioGame.runescape, StudioGame.game3, StudioGame.game4, StudioGame.oldscape}; // L: 17 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lot;Ljava/lang/String;I)I", - garbageValue = "2143395471" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-130227421" ) - public static int method2985(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 140 + int var2 = 0; // L: 141 - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var5[var6] = (byte)var7; - } else if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } + for (int var3 = 0; var3 < var1; ++var3) { // L: 142 + var2 = (var2 << 5) - var2 + AbstractSocket.charToByteCp1252(var0.charAt(var3)); } - var0.writeSmartByteShort(var5.length); - var0.offset += class264.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-14" - ) - static final int method2986(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + return var2; // L: 143 } } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 5f4f5b7345..68b3f3f527 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,160 +1,481 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("b") +@ObfuscatedName("n") public class class16 implements ThreadFactory { - @ObfuscatedName("t") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "Loe;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("l") - final ThreadGroup field87; - @ObfuscatedName("q") - final AtomicInteger field88; + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("i") + final ThreadGroup field74; + @ObfuscatedName("w") + final AtomicInteger field75; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ls;" + descriptor = "Ll;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Ls;)V" + descriptor = "(Ll;)V" ) class16(class14 var1) { this.this$0 = var1; - this.field88 = new AtomicInteger(1); + this.field75 = new AtomicInteger(1); SecurityManager var2 = System.getSecurityManager(); - this.field87 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); - } + this.field74 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); + } // L: 70 public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field87, var1, this.this$0.field79 + "-rest-request-" + this.field88.getAndIncrement(), 0L); - var2.setDaemon(true); + Thread var2 = new Thread(this.field74, var1, this.this$0.field62 + "-rest-request-" + this.field75.getAndIncrement(), 0L); + var2.setDaemon(true); // L: 74 var2.setPriority(5); - return var2; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "690140927" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } else { - var3[var6 + var4] = (byte)var7; - } - } - - return var5; + return var2; // L: 76 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1837132083" + descriptor = "(Loj;I)V", + garbageValue = "-8513816" ) - static final String method212(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 29 + if (var1 != null) { // L: 30 + int var2 = var0.offset; // L: 31 + var0.writeInt(var1.id); // L: 32 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 33 + if (var1.creationErrors[var3] != 0) { // L: 34 + var0.writeByte(var1.creationErrors[var3]); // L: 35 + } else { + try { + int var4 = var1.operations[var3]; // L: 39 + Field var5; + int var6; + if (var4 == 0) { // L: 40 + var5 = var1.fields[var3]; // L: 41 + var6 = Reflection.getInt(var5, (Object)null); // L: 42 + var0.writeByte(0); // L: 43 + var0.writeInt(var6); // L: 44 + } else if (var4 == 1) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 48 + var0.writeByte(0); // L: 49 + } else if (var4 == 2) { // L: 51 + var5 = var1.fields[var3]; // L: 52 + var6 = var5.getModifiers(); // L: 53 + var0.writeByte(0); // L: 54 + var0.writeInt(var6); // L: 55 + } + + Method var25; + if (var4 != 3) { // L: 57 + if (var4 == 4) { // L: 77 + var25 = var1.methods[var3]; // L: 78 + var6 = var25.getModifiers(); // L: 79 + var0.writeByte(0); // L: 80 + var0.writeInt(var6); // L: 81 + } + } else { + var25 = var1.methods[var3]; // L: 58 + byte[][] var10 = var1.arguments[var3]; // L: 59 + Object[] var7 = new Object[var10.length]; // L: 60 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 61 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 62 + var7[var8] = var9.readObject(); // L: 63 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 65 + if (var11 == null) { // L: 66 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 67 + var0.writeByte(1); // L: 68 + var0.writeLong(((Number)var11).longValue()); // L: 69 + } else if (var11 instanceof String) { // L: 71 + var0.writeByte(2); // L: 72 + var0.writeStringCp1252NullTerminated((String)var11); // L: 73 + } else { + var0.writeByte(4); // L: 75 + } + } + } catch (ClassNotFoundException var13) { // L: 84 + var0.writeByte(-10); // L: 85 + } catch (InvalidClassException var14) { // L: 87 + var0.writeByte(-11); // L: 88 + } catch (StreamCorruptedException var15) { // L: 90 + var0.writeByte(-12); // L: 91 + } catch (OptionalDataException var16) { // L: 93 + var0.writeByte(-13); // L: 94 + } catch (IllegalAccessException var17) { // L: 96 + var0.writeByte(-14); // L: 97 + } catch (IllegalArgumentException var18) { // L: 99 + var0.writeByte(-15); // L: 100 + } catch (InvocationTargetException var19) { // L: 102 + var0.writeByte(-16); // L: 103 + } catch (SecurityException var20) { // L: 105 + var0.writeByte(-17); // L: 106 + } catch (IOException var21) { // L: 108 + var0.writeByte(-18); // L: 109 + } catch (NullPointerException var22) { // L: 111 + var0.writeByte(-19); // L: 112 + } catch (Exception var23) { // L: 114 + var0.writeByte(-20); // L: 115 + } catch (Throwable var24) { // L: 117 + var0.writeByte(-21); // L: 118 + } + } + } + + var0.writeCrc(var2); // L: 121 + var1.remove(); // L: 122 + } + } // L: 123 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILie;ZI)V", + garbageValue = "-1672363550" + ) + static void method219(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = class54.getWorldMap().getMapArea(var0); // L: 4478 + int var4 = HealthBarDefinition.localPlayer.plane; // L: 4479 + int var5 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 4480 + int var6 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 4481 + Coord var7 = new Coord(var4, var5, var6); // L: 4482 + class54.getWorldMap().method6635(var3, var7, var1, var2); // L: 4483 + } // L: 4484 + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(ZLoj;I)V", + garbageValue = "-615408576" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field591 = 0; // L: 7764 + Client.field512 = 0; // L: 7765 + WorldMapLabel.method3970(); // L: 7766 + + int var2; + NPC var4; + int var5; + int var6; + int var7; + int var8; + int var9; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7769 + var2 = var1.readBits(15); // L: 7770 + if (var2 == 32767) { // L: 7771 + break; + } + + boolean var3 = false; // L: 7772 + if (Client.npcs[var2] == null) { // L: 7773 + Client.npcs[var2] = new NPC(); // L: 7774 + var3 = true; // L: 7775 + } + + var4 = Client.npcs[var2]; // L: 7777 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7778 + var4.npcCycle = Client.cycle; // L: 7779 + boolean var10; + if (Players.field1254) { // L: 7783 + var4.definition = ScriptFrame.getNpcDefinition(var1.readBits(14)); // L: 7784 + if (var0) { // L: 7785 + var6 = var1.readBits(8); // L: 7786 + if (var6 > 127) { // L: 7787 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7790 + if (var6 > 15) { // L: 7791 + var6 -= 32; + } + } + + var8 = var1.readBits(1); // L: 7793 + if (var8 == 1) { // L: 7794 + Client.field513[++Client.field512 - 1] = var2; + } + + var9 = Client.defaultRotations[var1.readBits(3)]; // L: 7795 + if (var3) { // L: 7796 + var4.orientation = var4.rotation = var9; + } + + var10 = var1.readBits(1) == 1; // L: 7797 + if (var10) { // L: 7798 + var1.readBits(32); // L: 7799 + } + + if (var0) { // L: 7801 + var7 = var1.readBits(8); // L: 7802 + if (var7 > 127) { // L: 7803 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7806 + if (var7 > 15) { // L: 7807 + var7 -= 32; + } + } + + var5 = var1.readBits(1); // L: 7809 + } else { + if (var0) { // L: 7812 + var6 = var1.readBits(8); // L: 7813 + if (var6 > 127) { // L: 7814 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7817 + if (var6 > 15) { // L: 7818 + var6 -= 32; + } + } + + var4.definition = ScriptFrame.getNpcDefinition(var1.readBits(14)); // L: 7820 + if (var0) { // L: 7821 + var7 = var1.readBits(8); // L: 7822 + if (var7 > 127) { // L: 7823 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7826 + if (var7 > 15) { // L: 7827 + var7 -= 32; + } + } + + var5 = var1.readBits(1); // L: 7829 + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7830 + if (var3) { // L: 7831 + var4.orientation = var4.rotation = var8; + } + + var9 = var1.readBits(1); // L: 7832 + if (var9 == 1) { // L: 7833 + Client.field513[++Client.field512 - 1] = var2; + } + + var10 = var1.readBits(1) == 1; // L: 7834 + if (var10) { // L: 7835 + var1.readBits(32); // L: 7836 + } + } + + var4.field1087 = var4.definition.size; // L: 7839 + var4.field1138 = var4.definition.rotation; // L: 7840 + if (var4.field1138 == 0) { // L: 7841 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 7842 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7843 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7844 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7845 + var4.idleSequence = var4.definition.idleSequence; // L: 7846 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7847 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7848 + var4.method2249(HealthBarDefinition.localPlayer.pathX[0] + var6, HealthBarDefinition.localPlayer.pathY[0] + var7, var5 == 1); // L: 7849 + } + + var1.exportIndex(); // L: 7851 + + int var14; + for (var2 = 0; var2 < Client.field512; ++var2) { // L: 7854 + var14 = Client.field513[var2]; // L: 7855 + var4 = Client.npcs[var14]; // L: 7856 + var5 = var1.readUnsignedByte(); // L: 7857 + if (Players.field1254 && (var5 & 128) != 0) { // L: 7858 + var6 = var1.readUnsignedByte(); // L: 7859 + var5 += var6 << 8; // L: 7860 + } + + if ((var5 & 4) != 0) { // L: 7862 + var6 = var1.method6996(); // L: 7863 + int var11; + int var12; + int var15; + if (var6 > 0) { // L: 7864 + for (var7 = 0; var7 < var6; ++var7) { // L: 7865 + var9 = -1; // L: 7867 + var15 = -1; // L: 7868 + var11 = -1; // L: 7869 + var8 = var1.readUShortSmart(); // L: 7870 + if (var8 == 32767) { // L: 7871 + var8 = var1.readUShortSmart(); // L: 7872 + var15 = var1.readUShortSmart(); // L: 7873 + var9 = var1.readUShortSmart(); // L: 7874 + var11 = var1.readUShortSmart(); // L: 7875 + } else if (var8 != 32766) { // L: 7877 + var15 = var1.readUShortSmart(); // L: 7878 + } else { + var8 = -1; // L: 7880 + } + + var12 = var1.readUShortSmart(); // L: 7881 + var4.addHitSplat(var8, var15, var9, var11, Client.cycle, var12); // L: 7882 + } + } + + var7 = var1.method6995(); // L: 7885 + if (var7 > 0) { // L: 7886 + for (var8 = 0; var8 < var7; ++var8) { // L: 7887 + var9 = var1.readUShortSmart(); // L: 7888 + var15 = var1.readUShortSmart(); // L: 7889 + if (var15 != 32767) { // L: 7890 + var11 = var1.readUShortSmart(); // L: 7891 + var12 = var1.readUnsignedByte(); // L: 7892 + int var13 = var15 > 0 ? var1.method6995() : var12; // L: 7893 + var4.addHealthBar(var9, Client.cycle, var15, var11, var12, var13); // L: 7894 + } else { + var4.removeHealthBar(var9); // L: 7896 + } + } + } + } + + if ((var5 & 512) != 0) { // L: 7900 + var4.field1145 = var1.readInt(); // L: 7901 + } + + if ((var5 & 2) != 0) { // L: 7903 + var4.definition = ScriptFrame.getNpcDefinition(var1.method7120()); // L: 7904 + var4.field1087 = var4.definition.size; // L: 7905 + var4.field1138 = var4.definition.rotation; // L: 7906 + var4.walkSequence = var4.definition.walkSequence; // L: 7907 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7908 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7909 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7910 + var4.idleSequence = var4.definition.idleSequence; // L: 7911 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7912 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7913 + } + + if ((var5 & 16) != 0) { // L: 7915 + var4.targetIndex = var1.method7004(); // L: 7916 + if (var4.targetIndex == 65535) { // L: 7917 + var4.targetIndex = -1; + } + } + + if ((var5 & 1) != 0) { // L: 7919 + var6 = var1.method7006(); // L: 7920 + var7 = var1.method7006(); // L: 7921 + if (Players.field1254) { // L: 7922 + var4.field1127 = var1.method6995() == 1; // L: 7923 + } + + var8 = var4.x - (var6 - class19.baseX - class19.baseX) * 64; // L: 7925 + var9 = var4.y - (var7 - DefaultsGroup.baseY - DefaultsGroup.baseY) * 64; // L: 7926 + if (var8 != 0 || var9 != 0) { // L: 7927 + var4.field1112 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; + } + } + + if (Players.field1254 && (var5 & 256) != 0 || !Players.field1254 && (var5 & 128) != 0) { // L: 7929 + var4.field1083 = var1.method7128(); // L: 7930 + var4.field1100 = var1.method6973(); // L: 7931 + var4.field1128 = var1.method7128(); // L: 7932 + var4.field1130 = var1.method6999(); // L: 7933 + var4.field1131 = var1.method7120() + Client.cycle; // L: 7934 + var4.field1132 = var1.readUnsignedShort() + Client.cycle; // L: 7935 + var4.field1133 = var1.method7004(); // L: 7936 + var4.pathLength = 1; // L: 7937 + var4.field1144 = 0; // L: 7938 + var4.field1083 += var4.pathX[0]; // L: 7939 + var4.field1100 += var4.pathY[0]; // L: 7940 + var4.field1128 += var4.pathX[0]; // L: 7941 + var4.field1130 += var4.pathY[0]; // L: 7942 + } + + if ((var5 & 32) != 0) { // L: 7944 + var6 = var1.method7004(); // L: 7945 + if (var6 == 65535) { // L: 7946 + var6 = -1; + } + + var7 = var1.readUnsignedByte(); // L: 7947 + if (var6 == var4.sequence && var6 != -1) { // L: 7948 + var8 = MouseHandler.SequenceDefinition_get(var6).field1965; // L: 7949 + if (var8 == 1) { // L: 7950 + var4.sequenceFrame = 0; // L: 7951 + var4.sequenceFrameCycle = 0; // L: 7952 + var4.sequenceDelay = var7; // L: 7953 + var4.field1116 = 0; // L: 7954 + } + + if (var8 == 2) { // L: 7956 + var4.field1116 = 0; // L: 7957 + } + } else if (var6 == -1 || var4.sequence == -1 || MouseHandler.SequenceDefinition_get(var6).field1959 >= MouseHandler.SequenceDefinition_get(var4.sequence).field1959) { // L: 7960 + var4.sequence = var6; // L: 7961 + var4.sequenceFrame = 0; // L: 7962 + var4.sequenceFrameCycle = 0; // L: 7963 + var4.sequenceDelay = var7; // L: 7964 + var4.field1116 = 0; // L: 7965 + var4.field1144 = var4.pathLength; // L: 7966 + } + } + + if ((var5 & 64) != 0) { // L: 7970 + var4.spotAnimation = var1.readUnsignedShort(); // L: 7971 + var6 = var1.method7044(); // L: 7972 + var4.field1126 = var6 >> 16; // L: 7973 + var4.field1125 = (var6 & 65535) + Client.cycle; // L: 7974 + var4.spotAnimationFrame = 0; // L: 7975 + var4.spotAnimationFrameCycle = 0; // L: 7976 + if (var4.field1125 > Client.cycle) { // L: 7977 + var4.spotAnimationFrame = -1; + } + + if (var4.spotAnimation == 65535) { // L: 7978 + var4.spotAnimation = -1; + } + } + + if ((var5 & 8) != 0) { // L: 7980 + var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7981 + var4.overheadTextCyclesRemaining = 100; // L: 7982 + } + } + + for (var2 = 0; var2 < Client.field591; ++var2) { // L: 7986 + var14 = Client.field592[var2]; // L: 7987 + if (Client.npcs[var14].npcCycle != Client.cycle) { // L: 7988 + Client.npcs[var14].definition = null; // L: 7989 + Client.npcs[var14] = null; // L: 7990 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7993 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7994 + if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7995 + throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7996 + } + } + } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "677326358" - ) - static final void method207(String var0, int var1) { - PacketBufferNode var2 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class113.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.method7066(var1); - Client.packetWriter.addNode(var2); - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Ljt;I)V", - garbageValue = "1190749273" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field699) { - Client.field710[var0.rootIndex] = true; - } - - } + } // L: 7999 } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 1e7e8f121a..7a6d210c03 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -5,198 +5,132 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("z") class class17 implements SSLSession { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 821791441 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lk;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lg;)V" + descriptor = "(Lk;)V" ) class17(class12 var1) { - this.this$1 = var1; - } - - public String getProtocol() { - throw new UnsupportedOperationException(); + this.this$1 = var1; // L: 117 } public int getApplicationBufferSize() { - return 0; - } - - public int getPeerPort() { - return 0; - } - - public long getCreationTime() { - throw new UnsupportedOperationException(); + return 0; // L: 119 } public String getCipherSuite() { - throw new UnsupportedOperationException(); - } - - public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); - } - - public Principal getLocalPrincipal() { - throw new UnsupportedOperationException(); - } - - public int getPacketBufferSize() { - throw new UnsupportedOperationException(); - } - - public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field65; - } - - public boolean isValid() { - throw new UnsupportedOperationException(); - } - - public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); - } - - public void invalidate() { - throw new UnsupportedOperationException(); - } - - public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); - } - - public void removeValue(String var1) { - throw new UnsupportedOperationException(); - } - - public Object getValue(String var1) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 123 } public byte[] getId() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 131 } public long getLastAccessedTime() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 135 } - public String[] getValueNames() { - throw new UnsupportedOperationException(); + public Principal getLocalPrincipal() { + throw new UnsupportedOperationException(); // L: 143 + } + + public int getPacketBufferSize() { + throw new UnsupportedOperationException(); // L: 147 } public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { - return null; + return null; // L: 151 + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field53; // L: 155 } public String getPeerHost() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 159 + } + + public int getPeerPort() { + return 0; // L: 163 } public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return null; + return null; // L: 167 } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "124" - ) - static void method226() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + public String getProtocol() { + throw new UnsupportedOperationException(); // L: 171 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "-50" - ) - static char method244(char var0) { - if (var0 == 198) { - return 'E'; - } else if (var0 == 230) { - return 'e'; - } else if (var0 == 223) { - return 's'; - } else if (var0 == 338) { - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); - } + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); // L: 175 } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1864336620" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; + public Object getValue(String var1) { + throw new UnsupportedOperationException(); // L: 179 } - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "78" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } + public boolean isValid() { + throw new UnsupportedOperationException(); // L: 191 } - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-43" - ) - static void method266() { - if (Widget.field3165 != null) { - Client.field763 = Client.cycle; - Widget.field3165.method5434(); + public void removeValue(String var1) { + throw new UnsupportedOperationException(); // L: 199 + } - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - Widget.field3165.method5433((Client.players[var0].x >> 7) + WorldMapSectionType.baseX, (Client.players[var0].y >> 7) + PlayerComposition.baseY); - } - } + public void invalidate() { + throw new UnsupportedOperationException(); // L: 187 + } + + public long getCreationTime() { + throw new UnsupportedOperationException(); // L: 127 + } + + public String[] getValueNames() { + throw new UnsupportedOperationException(); // L: 183 + } + + public Certificate[] getLocalCertificates() { + throw new UnsupportedOperationException(); // L: 139 + } + + public void putValue(String var1, Object var2) { + throw new UnsupportedOperationException(); // L: 195 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-560273502" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 592 + var1 /= 2; } + if (var2 > 192) { // L: 593 + var1 /= 2; + } + + if (var2 > 217) { // L: 594 + var1 /= 2; + } + + if (var2 > 243) { // L: 595 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 596 + return var3; // L: 597 } } diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java index 13ea62c7eb..bd073a345f 100644 --- a/runescape-client/src/main/java/class174.java +++ b/runescape-client/src/main/java/class174.java @@ -1,89 +1,84 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fs") public class class174 { - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("directions") public static int[][] directions; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("distances") public static int[][] distances; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1698208835 - ) - public static int field1994; - @ObfuscatedName("a") + @ObfuscatedName("p") @Export("bufferX") public static int[] bufferX; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("bufferY") public static int[] bufferY; + @ObfuscatedName("io") + @ObfuscatedGetter( + intValue = -1116273289 + ) + @Export("cameraY") + static int cameraY; static { - directions = new int[128][128]; - distances = new int[128][128]; - bufferX = new int[4096]; - bufferY = new int[4096]; + 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 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-44700481" + descriptor = "(Low;IIII)V", + garbageValue = "-1139186342" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (class4.World_request == null) { - class4.World_request = WorldMapSection0.urlRequester.request(new URL(Messages.field1273)); - } else if (class4.World_request.isDone()) { - byte[] var0 = class4.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class386.World_worlds = new World[World.World_count]; + static void method3512(SpritePixels var0, int var1, int var2, int var3) { + WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, NetSocket.method2923(var1, var2, var3), var0.pixels.length * 4); // L: 46 + } // L: 47 - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class386.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "18" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class132.Widget_loadedInterfaces[var0]) { // L: 216 + return true; + } else if (!class283.Widget_archive.tryLoadGroup(var0)) { // L: 217 + return false; + } else { + int var1 = class283.Widget_archive.getGroupFileCount(var0); // L: 218 + if (var1 == 0) { // L: 219 + class132.Widget_loadedInterfaces[var0] = true; // L: 220 + return true; // L: 221 + } else { + if (WorldMapSection1.Widget_interfaceComponents[var0] == null) { // L: 223 + WorldMapSection1.Widget_interfaceComponents[var0] = new Widget[var1]; } - class274.sortWorlds(class386.World_worlds, 0, class386.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - class4.World_request = null; - return true; + for (int var2 = 0; var2 < var1; ++var2) { // L: 224 + if (WorldMapSection1.Widget_interfaceComponents[var0][var2] == null) { // L: 225 + byte[] var3 = class283.Widget_archive.takeFile(var0, var2); // L: 226 + if (var3 != null) { // L: 227 + WorldMapSection1.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228 + WorldMapSection1.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229 + if (var3[0] == -1) { // L: 230 + WorldMapSection1.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + WorldMapSection1.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231 + } + } + } + } + + class132.Widget_loadedInterfaces[var0] = true; // L: 235 + return true; // L: 236 } - } catch (Exception var4) { - var4.printStackTrace(); - class4.World_request = null; } - - return false; - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1701952628" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; } } diff --git a/runescape-client/src/main/java/class176.java b/runescape-client/src/main/java/class176.java index 85975aa593..eb588f195b 100644 --- a/runescape-client/src/main/java/class176.java +++ b/runescape-client/src/main/java/class176.java @@ -1,217 +1,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fu") +@ObfuscatedName("fz") public class class176 { - @ObfuscatedName("eb") + @ObfuscatedName("n") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("r") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "(S)Z", + garbageValue = "28777" ) - @Export("archive8") - static Archive archive8; - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-400532882" - ) - static int method3442(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class174.loadWorlds() ? 1 : 0; - return 1; - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var9 = Canvas.worldListStart(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var9 = AttackOption.getNextWorldListWorld(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var7 = null; - - for (var8 = 0; var8 < World.World_count; ++var8) { - if (var3 == class386.World_worlds[var8].id) { - var7 = class386.World_worlds[var8]; - break; - } - } - - if (var7 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] == 1; - var8 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3] == 1; - class138.sortWorldList(var3, var10, var8, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - return 1; - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class126.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class112.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class112.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class126.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class245.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class245.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class126.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class87.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class87.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - var5 = class126.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = class65.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class65.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.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) { - --class54.Interpreter_stringStackSize; - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class54.Interpreter_stringStackSize; - --AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.field681; - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - if (var3 >= 0 && var3 < World.World_count) { - var7 = class386.World_worlds[var3]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - } + static final boolean method3531() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 99 } } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index 5e02547b0d..f4ba4f7e3c 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -1,69 +1,45 @@ import java.util.Comparator; import java.util.Map.Entry; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("q") class class18 implements Comparator { + @ObfuscatedName("jw") + @ObfuscatedGetter( + intValue = 433538639 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ly;" + descriptor = "Lx;" ) final class10 this$0; @ObfuscatedSignature( - descriptor = "(Ly;)V" + descriptor = "(Lx;)V" ) class18(class10 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 40 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", - garbageValue = "1973366143" + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", + garbageValue = "-59" ) - int method276(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + int method272(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 } public int compare(Object var1, Object var2) { - return this.method276((Entry)var1, (Entry)var2); + return this.method272((Entry)var1, (Entry)var2); // L: 46 } public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-8553" - ) - public static boolean method271(int var0) { - return (var0 & 1) != 0; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1094271448" - ) - static final void method282() { - Object var10000 = null; - String var0 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - GraphicsDefaults.addGameMessage(30, "", var0); - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1318932458" - ) - static void method280() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class21.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - + return super.equals(var1); // L: 50 } } diff --git a/runescape-client/src/main/java/class184.java b/runescape-client/src/main/java/class184.java index c803034226..8503383d2f 100644 --- a/runescape-client/src/main/java/class184.java +++ b/runescape-client/src/main/java/class184.java @@ -2,216 +2,207 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gu") +@ObfuscatedName("gd") public class class184 implements WorldMapSection { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1718096021 - ) - int field2090; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1348333705 - ) - int field2091; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -5504601 - ) - int field2092; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 820070789 - ) - int field2093; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1959067269 - ) - int field2098; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 770443607 - ) - int field2095; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -154578139 - ) - int field2096; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1435895249 - ) - int field2097; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1827923729 - ) - int field2100; + @ObfuscatedName("hl") + @Export("regionMapArchives") + static byte[][] regionMapArchives; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1128738871 + intValue = -1246442681 + ) + int field2093; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1207528751 ) int field2099; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1509662935 + ) + int field2102; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1558504127 + ) + int field2094; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1609707315 + ) + int field2095; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1074300817 + ) + int field2096; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1892822935 + ) + int field2092; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1654705375 + ) + int field2098; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -123705663 + ) + int field2091; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 902477063 + ) + int field2100; class184() { - } + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfr;I)V", - garbageValue = "2018229058" + descriptor = "(Lfb;I)V", + garbageValue = "-1844012640" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2098) { - var1.regionLowX = this.field2098; + if (var1.regionLowX > this.field2095) { // L: 21 + var1.regionLowX = this.field2095; } - if (var1.regionHighX < this.field2098) { - var1.regionHighX = this.field2098; + if (var1.regionHighX < this.field2095) { + var1.regionHighX = this.field2095; // L: 22 } - if (var1.regionLowY > this.field2095) { - var1.regionLowY = this.field2095; + if (var1.regionLowY > this.field2096) { // L: 23 + var1.regionLowY = this.field2096; } - if (var1.regionHighY < this.field2095) { - var1.regionHighY = this.field2095; + if (var1.regionHighY < this.field2096) { // L: 24 + var1.regionHighY = this.field2096; } - } + } // L: 25 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-964071790" + garbageValue = "-1501827396" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2090 && var1 < this.field2090 + this.field2091) { - return var2 >= (this.field2092 << 6) + (this.field2096 << 3) && var2 <= (this.field2092 << 6) + (this.field2096 << 3) + 7 && var3 >= (this.field2093 << 6) + (this.field2097 << 3) && var3 <= (this.field2093 << 6) + (this.field2097 << 3) + 7; + if (var1 >= this.field2093 && var1 < this.field2099 + this.field2093) { // L: 28 + return var2 >= (this.field2102 << 6) + (this.field2092 << 3) && var2 <= (this.field2102 << 6) + (this.field2092 << 3) + 7 && var3 >= (this.field2094 << 6) + (this.field2098 << 3) && var3 <= (this.field2094 << 6) + (this.field2098 << 3) + 7; // L: 31 } else { - return false; + return false; // L: 29 } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "381612084" + garbageValue = "-356013678" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2098 << 6) + (this.field2100 << 3) && var1 <= (this.field2098 << 6) + (this.field2100 << 3) + 7 && var2 >= (this.field2095 << 6) + (this.field2099 << 3) && var2 <= (this.field2095 << 6) + (this.field2099 << 3) + 7; + return var1 >= (this.field2095 << 6) + (this.field2091 << 3) && var1 <= (this.field2095 << 6) + (this.field2091 << 3) + 7 && var2 >= (this.field2096 << 6) + (this.field2100 << 3) && var2 <= (this.field2096 << 6) + (this.field2100 << 3) + 7; // L: 35 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIB)[I", - garbageValue = "88" + garbageValue = "-79" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field2098 * 64 - this.field2092 * 64) + (this.field2100 * 8 - this.field2096 * 8), var3 + (this.field2095 * 64 - this.field2093 * 64) + (this.field2099 * 8 - this.field2097 * 8)}; - return var4; + int[] var4 = new int[]{var2 + (this.field2095 * 64 - this.field2102 * 64) + (this.field2091 * 8 - this.field2092 * 8), var3 + (this.field2096 * 64 - this.field2094 * 64) + (this.field2100 * 8 - this.field2098 * 8)}; // L: 42 43 44 + return var4; // L: 45 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lic;", - garbageValue = "2033247854" + descriptor = "(III)Lie;", + garbageValue = "494177498" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 } else { - int var3 = this.field2092 * 64 - this.field2098 * 64 + (this.field2096 * 8 - this.field2100 * 8) + var1; - int var4 = var2 + (this.field2093 * 64 - this.field2095 * 64) + (this.field2097 * 8 - this.field2099 * 8); - return new Coord(this.field2090, var3, var4); + int var3 = this.field2102 * 64 - this.field2095 * 64 + (this.field2092 * 8 - this.field2091 * 8) + var1; // L: 52 + int var4 = var2 + (this.field2094 * 64 - this.field2096 * 64) + (this.field2098 * 8 - this.field2100 * 8); // L: 53 + return new Coord(this.field2093, var3, var4); // L: 54 } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;B)V", - garbageValue = "4" + descriptor = "(Lop;I)V", + garbageValue = "-682362313" ) @Export("read") public void read(Buffer var1) { - this.field2090 = var1.readUnsignedByte(); - this.field2091 = var1.readUnsignedByte(); - this.field2092 = var1.readUnsignedShort(); - this.field2096 = var1.readUnsignedByte(); - this.field2093 = var1.readUnsignedShort(); - this.field2097 = var1.readUnsignedByte(); - this.field2098 = var1.readUnsignedShort(); - this.field2100 = var1.readUnsignedByte(); - this.field2095 = var1.readUnsignedShort(); - this.field2099 = var1.readUnsignedByte(); - this.method3765(); - } + this.field2093 = var1.readUnsignedByte(); // L: 58 + this.field2099 = var1.readUnsignedByte(); // L: 59 + this.field2102 = var1.readUnsignedShort(); // L: 60 + this.field2092 = var1.readUnsignedByte(); // L: 61 + this.field2094 = var1.readUnsignedShort(); // L: 62 + this.field2098 = var1.readUnsignedByte(); // L: 63 + this.field2095 = var1.readUnsignedShort(); // L: 64 + this.field2091 = var1.readUnsignedByte(); // L: 65 + this.field2096 = var1.readUnsignedShort(); // L: 66 + this.field2100 = var1.readUnsignedByte(); // L: 67 + this.method3852(); // L: 68 + } // L: 69 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "517860362" ) - void method3765() { - } + void method3852() { + } // L: 71 - @ObfuscatedName("m") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIZIZB)V", - garbageValue = "1" + descriptor = "(ILbp;ZI)I", + garbageValue = "-265491210" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class386.World_worlds[var6]; - class386.World_worlds[var6] = class386.World_worlds[var1]; - class386.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (Decimator.method1024(class386.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class386.World_worlds[var9]; - class386.World_worlds[var9] = class386.World_worlds[var7]; - class386.World_worlds[var7++] = var10; - } + static int method3871(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3614 + Client.logoutTimer = 250; // L: 3615 + return 1; // L: 3616 + } else if (var0 != 5631 && var0 != 5633) { // L: 3618 + if (var0 == 5632) { // L: 3622 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 26; // L: 3623 + return 1; // L: 3624 + } else { + return 2; // L: 3626 } - - class386.World_worlds[var1] = class386.World_worlds[var7]; - class386.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } else { + class295.Interpreter_stringStackSize -= 2; // L: 3619 + return 1; // L: 3620 } - } - @ObfuscatedName("fk") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "-3304" + descriptor = "(Ljf;I)V", + garbageValue = "648897355" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (WorldMapDecorationType.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; + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field678) { // L: 11277 + Client.field594[var0.rootIndex] = true; // L: 11278 } - } + } // L: 11280 } diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index 082ea0379e..bc69386a33 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -1,21 +1,18 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("go") public class class185 { - @ObfuscatedName("i") - public static short[][] field2101; - @ObfuscatedName("ak") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-58" + descriptor = "(IIB)V", + garbageValue = "1" ) - public static int method3784(int var0) { - return class361.field4056[var0 & 16383]; - } + public static final void method3872(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; // L: 91 + ViewportMouse.ViewportMouse_y = var1; // L: 92 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 93 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 94 + ViewportMouse.ViewportMouse_false0 = false; // L: 95 + } // L: 96 } diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index e447d5604d..12245caac7 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -1,3 +1,4 @@ +import java.awt.Image; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; @@ -5,162 +6,268 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("d") public class class19 { - @ObfuscatedName("g") + @ObfuscatedName("at") + static Image field89; + @ObfuscatedName("gk") @ObfuscatedGetter( - intValue = -1814549023 + intValue = -1107399791 ) - static int field98; - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "Lep;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("l") - Future field101; - @ObfuscatedName("q") - String field99; + @Export("baseX") + static int baseX; + @ObfuscatedName("i") + Future field92; + @ObfuscatedName("w") + String field90; class19(Future var1) { - this.field101 = var1; - } + this.field92 = var1; // L: 10 + } // L: 11 class19(String var1) { - this.method283(var1); - } + this.method278(var1); // L: 14 + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "-12672" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1091176174" ) - void method283(String var1) { - if (var1 == null) { + void method278(String var1) { + if (var1 == null) { // L: 18 var1 = ""; } - this.field99 = var1; - if (this.field101 != null) { - this.field101.cancel(true); - this.field101 = null; + this.field90 = var1; // L: 19 + if (this.field92 != null) { // L: 20 + this.field92.cancel(true); + this.field92 = null; // L: 22 } - } + } // L: 24 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1388329625" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" ) - public final String method295() { - return this.field99; + public final String method293() { + return this.field90; // L: 27 } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2125398132" + garbageValue = "390878741" ) - public boolean method285() { - return this.field99 != null || this.field101 == null; + public boolean method276() { + return this.field90 != null || this.field92 == null; // L: 31 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1402334300" + ) + public final boolean method280() { + return this.method276() ? true : this.field92.isDone(); // L: 35 36 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lm;", + garbageValue = "-2099684088" + ) + public final class21 method281() { + if (this.method276()) { // L: 40 + return new class21(this.field90); + } else if (!this.method280()) { + return null; // L: 41 + } else { + try { + return (class21)this.field92.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.method278(var2); // L: 48 + return new class21(var2); // L: 49 + } + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-394554028" + ) + public static boolean method279(int var0) { + return (var0 >> 21 & 1) != 0; // L: 21 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-444636057" + ) + static int method290(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 805 + var0 -= 1000; // L: 806 + var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 807 + } else { + var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 809 + } + + class184.invalidateWidget(var3); // L: 810 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 811 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 831 + var3.modelType = 2; // L: 832 + var3.modelId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 833 + return 1; // L: 834 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 836 + var3.modelType = 3; // L: 837 + var3.modelId = HealthBarDefinition.localPlayer.appearance.getChatHeadId(); // L: 838 + return 1; // L: 839 + } else { + return 2; // L: 841 + } + } else { + class14.Interpreter_intStackSize -= 2; // L: 812 + int var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 813 + int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 814 + var3.itemId = var4; // L: 815 + var3.itemQuantity = var5; // L: 816 + ItemComposition var6 = TaskHandler.ItemDefinition_get(var4); // L: 817 + var3.modelAngleX = var6.xan2d; // L: 818 + var3.modelAngleY = var6.yan2d; // L: 819 + var3.modelAngleZ = var6.zan2d; // L: 820 + var3.modelOffsetX = var6.offsetX2d; // L: 821 + var3.modelOffsetY = var6.offsetY2d; // L: 822 + var3.modelZoom = var6.zoom2d; // L: 823 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 824 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 825 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 826 + } + + if (var3.field3106 > 0) { // L: 827 + var3.modelZoom = var3.modelZoom * 32 / var3.field3106; + } else if (var3.rawWidth > 0) { // L: 828 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 829 + } } @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-93162153" + descriptor = "(IIIB)I", + garbageValue = "69" ) - public final boolean method286() { - return this.method285() ? true : this.field101.isDone(); + static final int method291(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 538 + int var4 = var0 & var2 - 1; // L: 539 + int var5 = var1 / var2; // L: 540 + int var6 = var1 & var2 - 1; // L: 541 + int var7 = DynamicObject.method2002(var3, var5); // L: 542 + int var8 = DynamicObject.method2002(var3 + 1, var5); // L: 543 + int var9 = DynamicObject.method2002(var3, var5 + 1); // L: 544 + int var10 = DynamicObject.method2002(var3 + 1, var5 + 1); // L: 545 + int var11 = Messages.method2376(var7, var8, var4, var2); // L: 546 + int var12 = Messages.method2376(var9, var10, var4, var2); // L: 547 + return Messages.method2376(var11, var12, var6, var2); // L: 548 } - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)Lo;", - garbageValue = "255" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-165591138" ) - public final class21 method287() { - if (this.method285()) { - return new class21(this.field99); - } else if (!this.method286()) { - return null; - } else { - try { - return (class21)this.field101.get(); - } catch (Exception var3) { - String var2 = "Error retrieving REST request reply"; - System.err.println(var2 + "\r\n" + var3); - this.method283(var2); - return new class21(var2); + public static String method277(String var0) { + int var1 = var0.length(); // L: 166 + char[] var2 = new char[var1]; // L: 167 + byte var3 = 2; // L: 168 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 169 + char var5 = var0.charAt(var4); // L: 170 + if (var3 == 0) { // L: 171 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 172 + char var6; + if (var5 != 181 && var5 != 402) { // L: 175 + var6 = Character.toTitleCase(var5); // L: 179 + } else { + var6 = var5; // L: 176 + } + + var5 = var6; // L: 181 } - } - } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-556332656" - ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; + if (Character.isLetter(var5)) { // L: 183 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 184 + if (Character.isSpaceChar(var5)) { // L: 185 + if (var3 != 2) { // L: 186 + var3 = 1; + } + } else { + var3 = 1; // L: 188 + } + } else { + var3 = 2; } + + var2[var4] = var5; // L: 189 } - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - class274.sortWorlds(class386.World_worlds, 0, class386.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + return new String(var2); // L: 191 } - @ObfuscatedName("m") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(B)[Ljd;", - garbageValue = "-2" + descriptor = "(I)V", + garbageValue = "-1058992948" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_ultimateIronman, PlayerType.field3657, PlayerType.field3654, PlayerType.PlayerType_ironman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3658, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal}; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "2070378051" - ) - static int method299(int var0, Script var1, boolean var2) { - Widget var3 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } + static final void method289() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 3217 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 3220 + class87.method2223(); // L: 3222 + ArchiveDisk.method6322(); // L: 3223 + NPCComposition.NpcDefinition_cached.clear(); // L: 3225 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 3226 + CollisionMap.method3492(); // L: 3228 + class78.method2078(); // L: 3229 + ScriptFrame.method1117(); // L: 3230 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 3232 + VarpDefinition.VarpDefinition_cached.clear(); // L: 3235 + FileSystem.field1564.method6811(); // L: 3237 + class240.HitSplatDefinition_cachedSprites.method6811(); // L: 3238 + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 3240 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 3241 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 3242 + FileSystem.method2908(); // L: 3244 + StructComposition.StructDefinition_cached.clear(); // L: 3246 + ParamComposition.ParamDefinition_cached.clear(); // L: 3249 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 3252 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3255 + PacketWriter.method2401(); // L: 3257 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3258 + Script.Script_cached.clear(); // L: 3259 + InvDefinition.archive0.clearFiles(); // L: 3260 + ApproximateRouteStrategy.archive1.clearFiles(); // L: 3261 + ParamComposition.archive3.clearFiles(); // L: 3262 + class12.archive4.clearFiles(); // L: 3263 + class11.archive5.clearFiles(); // L: 3264 + Messages.archive6.clearFiles(); // L: 3265 + HorizontalAlignment.archive7.clearFiles(); // L: 3266 + GrandExchangeOfferOwnWorldComparator.archive8.clearFiles(); // L: 3267 + SecureRandomFuture.archive9.clearFiles(); // L: 3268 + ChatChannel.archive10.clearFiles(); // L: 3269 + AbstractWorldMapIcon.archive11.clearFiles(); // L: 3270 + class14.archive12.clearFiles(); // L: 3271 + } // L: 3272 } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 65c7de15a0..5bb422d268 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -3,150 +3,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gs") public class class194 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgs;" ) - static final class194 field2189; - @ObfuscatedName("q") + static final class194 field2177; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgs;" ) - static final class194 field2184; - @ObfuscatedName("jf") + static final class194 field2178; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2080703643 - ) - static int field2186; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -814877491 + intValue = -1031005125 ) @Export("value") final int value; static { - field2189 = new class194(0); - field2184 = new class194(1); + field2177 = new class194(0); // L: 4 + field2178 = new class194(1); // L: 5 } class194(int var1) { - this.value = var1; - } + this.value = var1; // L: 9 + } // L: 10 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "28" + descriptor = "(II)[B", + garbageValue = "-1906665444" ) - static void method3875(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { - int var5 = 0; - if (var1 > var4.field807) { - var5 += var1 - var4.field807; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } - - if (var2 > var4.field803) { - var5 += var2 - var4.field803; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field804 && WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } - - int var6 = (var4.field804 - var5) * WorldMapDecorationType.clientPreferences.areaSoundEffectsVolume / var4.field804; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(class260.archive4, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(RouteStrategy.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - ApproximateRouteStrategy.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method891(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field811 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(class260.archive4, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(RouteStrategy.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - ApproximateRouteStrategy.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field811 = var4.field808 + (int)(Math.random() * (double)(var4.field809 - var4.field808)); - } - } - } else { - var4.stream2.method891(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - ApproximateRouteStrategy.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } - } - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-709809423" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112 } } diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java index cd7482dcbc..c07fef0641 100644 --- a/runescape-client/src/main/java/class196.java +++ b/runescape-client/src/main/java/class196.java @@ -1,73 +1,66 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gq") +@ObfuscatedName("gr") public class class196 { - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-333035229" + descriptor = "(ILbp;ZI)I", + garbageValue = "145453040" ) - public static byte[] method3888(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? method3889(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); + static int method3972(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1296 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1297 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1298 + return 1; // L: 1299 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1301 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1302 + return 1; // L: 1303 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1305 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.text; // L: 1306 + return 1; // L: 1307 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1309 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1310 + return 1; // L: 1311 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1313 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1314 + return 1; // L: 1315 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1317 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1318 + return 1; // L: 1319 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1321 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1322 + return 1; // L: 1323 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1325 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1326 + return 1; // L: 1327 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1329 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1330 + return 1; // L: 1331 + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1333 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1334 + return 1; // L: 1335 + } else if (var0 == 2610) { // L: 1337 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1338 + return 1; // L: 1339 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1341 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color; // L: 1342 + return 1; // L: 1343 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1345 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color2; // L: 1346 + return 1; // L: 1347 + } else if (var0 == 2613) { // L: 1349 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1350 + return 1; // L: 1351 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1353 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1354 + return 1; // L: 1355 + } else if (var0 != 2615 && var0 != 2616) { // L: 1357 + return 2; // L: 1361 } else { - throw new IllegalArgumentException(); + ++class14.Interpreter_intStackSize; // L: 1358 + return 1; // L: 1359 } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIII)Lbe;", - garbageValue = "-162700802" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = FaceNormal.method4396(var1, var0); - Script var4 = Tiles.method2023(var3, var0); - if (var4 != null) { - return var4; - } else { - int var5 = (-3 - var2 << 8) + var0; - var4 = Tiles.method2023(var5, var0); - return var4 != null ? var4 : null; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "-74" - ) - public static byte[] method3889(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-11" - ) - static final void method3881() { - Object var10000 = null; - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - GraphicsDefaults.addGameMessage(30, "", var0); - } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 87f9b0617f..9e5794741e 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("f") +@ObfuscatedName("s") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index 4847bb25e4..0cbb761c26 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,99 +1,125 @@ import java.io.IOException; import java.util.concurrent.Callable; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("r") public class class20 implements Callable { - @ObfuscatedName("ba") - @ObfuscatedGetter( - intValue = -1667881213 - ) - static int field103; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ly;" + descriptor = "Lx;" ) - final class10 field104; + final class10 field94; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ls;" + descriptor = "Ll;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Ls;Ly;)V" + descriptor = "(Ll;Lx;)V" ) class20(class14 var1, class10 var2) { this.this$0 = var1; - this.field104 = var2; + this.field94 = var2; } public Object call() throws Exception { try { - while (this.field104.method94()) { - class121.method2542(10L); + while (this.field94.method89()) { // L: 52 + FloorUnderlayDefinition.method3190(10L); // L: 53 } - } catch (IOException var2) { - return new class21("Error servicing REST query: " + var2.getMessage()); + } catch (IOException var2) { // L: 56 + return new class21("Error servicing REST query: " + var2.getMessage()); // L: 57 } - return this.field104.method98(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "846387799" - ) - static final int method303(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = Clock.method2867(var3, var5); - int var8 = Clock.method2867(var3 + 1, var5); - int var9 = Clock.method2867(var3, var5 + 1); - int var10 = Clock.method2867(var3 + 1, var5 + 1); - int var11 = class157.method2986(var7, var8, var4, var2); - int var12 = class157.method2986(var9, var10, var4, var2); - return class157.method2986(var11, var12, var6, var2); + return this.field94.method100(); // L: 59 } @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "996219685" + descriptor = "(Lko;Lko;Lko;I)V", + garbageValue = "1541093699" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - class112.method2474(2); - if (var0) { - Login.Login_password = ""; - } + public static void method295(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 + HitSplatDefinition.field1799 = var1; // L: 47 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48 + } // L: 49 - Login.method1930(); - class14.method175(); + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-23497381" + ) + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 + } + + } + } // L: 69 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Lbw;", + garbageValue = "-632858850" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 247 + return class91.getNextWorldListWorld(); // L: 248 } - @ObfuscatedName("fi") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "935368725" + descriptor = "(B)V", + garbageValue = "-93" ) - static final void method302() { - if (Client.logoutTimer > 0) { - AttackOption.logOut(); + static final void method294() { + Object var10000 = null; // L: 114 + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + class397.addGameMessage(30, "", var0); // L: 116 + } // L: 118 + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1226248726" + ) + static final void method298(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 11843 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2809()) { // L: 11844 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11845 + if (var2.rank == -1) { // L: 11846 + PacketWriter var3 = Client.packetWriter; // L: 11847 + PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2737, var3.isaacCipher); // L: 11848 + var4.packetBuffer.writeByte(3 + Client.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 11849 + var4.packetBuffer.writeByte(var0); // L: 11850 + var4.packetBuffer.writeShort(var1); // L: 11851 + var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 11852 + var3.addNode(var4); // L: 11853 + } + } + } + } // L: 11854 + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(Ljf;I)Ljava/lang/String;", + garbageValue = "2082215061" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var0)) == 0) { // L: 11917 + return null; } else { - Client.timer.method5904(); - UserList.updateGameState(40); - PendingSpawn.field1101 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11918 11919 11921 } } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index b143403c46..b59e6e42a7 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -8,138 +8,416 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("m") public class class21 { - @ObfuscatedName("ai") - @Export("client") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lclient;" + descriptor = "Lcm;" ) - static Client client; + @Export("World_request") + static UrlRequest World_request; @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "Lon;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "[Lon;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("l") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -290366261 + intValue = 1952099167 ) - final int field112; - @ObfuscatedName("q") - final String field107; + final int field102; + @ObfuscatedName("w") + final String field104; class21(String var1) { - this.field112 = 400; - this.field107 = ""; - } + this.field102 = 400; // L: 32 + this.field104 = ""; // L: 33 + } // L: 34 class21(HttpURLConnection var1) throws IOException { - this.field112 = var1.getResponseCode(); - var1.getResponseMessage(); - var1.getHeaderFields(); - StringBuilder var2 = new StringBuilder(); - InputStream var3 = this.field112 >= 300 ? var1.getErrorStream() : var1.getInputStream(); - if (var3 != null) { - InputStreamReader var4 = new InputStreamReader(var3); - BufferedReader var5 = new BufferedReader(var4); + this.field102 = var1.getResponseCode(); // L: 14 + var1.getResponseMessage(); // L: 15 + var1.getHeaderFields(); // L: 16 + StringBuilder var2 = new StringBuilder(); // L: 17 + InputStream var3 = this.field102 >= 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 String var6; - while ((var6 = var5.readLine()) != null) { - var2.append(var6); + while ((var6 = var5.readLine()) != null) { // L: 23 + var2.append(var6); // L: 24 } - var3.close(); + var3.close(); // L: 26 } - this.field107 = var2.toString(); - } + this.field104 = var2.toString(); // L: 28 + } // L: 29 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1111587783" + garbageValue = "-701476326" ) - public int method317() { - return this.field112; + public int method310() { + return this.field102; // L: 37 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "637043556" + garbageValue = "932621711" ) - public String method312() { - return this.field107; + public String method303() { + return this.field104; } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "-2146545092" + descriptor = "(Lko;III)[Low;", + garbageValue = "-1741368742" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public static SpritePixels[] method312(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 40 + boolean var3; + if (var4 == null) { // L: 41 + var3 = false; // L: 42 } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; + Script.SpriteBuffer_decode(var4); // L: 45 + var3 = true; // L: 46 } + + return !var3 ? null : class283.method5221(); // L: 48 49 } - @ObfuscatedName("gj") + @ObfuscatedName("e") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 81 + } + + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(Lci;ZB)V", - garbageValue = "-27" + descriptor = "(Lii;I)V", + garbageValue = "1398139213" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { - var0.isUnanimated = true; + static final void method309(class240 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7205 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + if (class240.field2781 == var0) { // L: 7206 + var2 = var1.method6995(); // L: 7207 + var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7208 + var4 = (var2 & 7) + Actor.field1146; // L: 7209 + var5 = var1.readUnsignedByte(); // L: 7210 + var6 = var5 >> 2; // L: 7211 + var7 = var5 & 3; // L: 7212 + var8 = Client.field530[var6]; // L: 7213 + var9 = var1.method7004(); // L: 7214 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7215 + WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7216 } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = class247.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = MidiPcmStream.getTileHeight(var0.x, var0.y, VertexNormal.Client_plane); - var0.playerCycle = Client.cycle; - PlayerComposition.scene.addNullableObject(VertexNormal.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) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + } else if (class240.field2777 == var0) { // L: 7220 + var2 = var1.method6997(); // L: 7221 + var3 = var2 >> 2; // L: 7222 + var4 = var2 & 3; // L: 7223 + var5 = Client.field530[var3]; // L: 7224 + var6 = var1.readUnsignedByte(); // L: 7225 + var7 = (var6 >> 4 & 7) + ItemComposition.field1931; // L: 7226 + var8 = (var6 & 7) + Actor.field1146; // L: 7227 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7228 + WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7229 + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } else if (class240.field2773 == var0) { // L: 7233 + var2 = var1.readUnsignedByte(); // L: 7234 + var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7235 + var4 = (var2 & 7) + Actor.field1146; // L: 7236 + var5 = var1.method7120(); // L: 7237 + var6 = var1.method7120(); // L: 7238 + var7 = var1.method7006(); // L: 7239 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7240 + NodeDeque var46 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4]; // L: 7241 + if (var46 != null) { // L: 7242 + for (TileItem var36 = (TileItem)var46.last(); var36 != null; var36 = (TileItem)var46.previous()) { // L: 7243 7244 7249 + if ((var6 & 32767) == var36.id && var7 == var36.quantity) { // L: 7245 + var36.quantity = var5; // L: 7246 + break; + } } - var0.tileHeight = MidiPcmStream.getTileHeight(var0.x, var0.y, VertexNormal.Client_plane); - var0.playerCycle = Client.cycle; - PlayerComposition.scene.drawEntity(VertexNormal.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + WallDecoration.updateItemPile(var3, var4); // L: 7251 + } + } + + } else { + int var10; + int var11; + int var12; + int var14; + if (class240.field2782 == var0) { // L: 7256 + byte var37 = var1.readByte(); // L: 7257 + var3 = var1.method7006(); // L: 7258 + var4 = var1.method7004(); // L: 7259 + var5 = var1.method6996() * 4; // L: 7260 + var6 = var1.method7008(); // L: 7261 + byte var39 = var1.method6973(); // L: 7262 + var8 = var1.method6995(); // L: 7263 + var9 = (var8 >> 4 & 7) + ItemComposition.field1931; // L: 7264 + var10 = (var8 & 7) + Actor.field1146; // L: 7265 + var11 = var1.readUnsignedByte() * 4; // L: 7266 + var12 = var1.method6997(); // L: 7267 + int var42 = var1.method7006(); // L: 7268 + var14 = var1.method6997(); // L: 7269 + var7 = var39 + var9; // L: 7270 + var2 = var37 + var10; // L: 7271 + if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var7 >= 0 && var2 >= 0 && var7 < 104 && var2 < 104 && var42 != 65535) { // L: 7272 + var9 = var9 * 128 + 64; // L: 7273 + var10 = var10 * 128 + 64; // L: 7274 + var7 = var7 * 128 + 64; // L: 7275 + var2 = var2 * 128 + 64; // L: 7276 + Projectile var35 = new Projectile(var42, GrandExchangeOfferTotalQuantityComparator.Client_plane, var9, var10, class392.getTileHeight(var9, var10, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var5, var4 + Client.cycle, var3 + Client.cycle, var14, var12, var6, var11); // L: 7277 + var35.setDestination(var7, var2, class392.getTileHeight(var7, var2, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var11, var4 + Client.cycle); // L: 7278 + Client.projectiles.addFirst(var35); // L: 7279 + } + + } else { + TileItem var33; + if (class240.field2780 == var0) { // L: 7283 + var2 = var1.method6995(); // L: 7284 + var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7285 + var4 = (var2 & 7) + Actor.field1146; // L: 7286 + var5 = var1.method7004(); // L: 7287 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7288 + NodeDeque var34 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4]; // L: 7289 + if (var34 != null) { // L: 7290 + for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { // L: 7291 7292 7297 + if ((var5 & 32767) == var33.id) { // L: 7293 + var33.remove(); // L: 7294 + break; + } + } + + if (var34.last() == null) { // L: 7299 + Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4] = null; + } + + WallDecoration.updateItemPile(var3, var4); // L: 7300 + } + } + + } else { + if (class240.field2772 == var0) { // L: 7305 + var2 = var1.readUnsignedByte(); // L: 7306 + var3 = var2 >> 4 & 15; // L: 7307 + var4 = var2 & 7; // L: 7308 + var5 = var1.method6997(); // L: 7309 + var6 = (var5 >> 4 & 7) + ItemComposition.field1931; // L: 7310 + var7 = (var5 & 7) + Actor.field1146; // L: 7311 + var8 = var1.method6996(); // L: 7312 + var9 = var1.method7004(); // L: 7313 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7314 + var10 = var3 + 1; // L: 7315 + if (HealthBarDefinition.localPlayer.pathX[0] >= var6 - var10 && HealthBarDefinition.localPlayer.pathX[0] <= var6 + var10 && HealthBarDefinition.localPlayer.pathY[0] >= var7 - var10 && HealthBarDefinition.localPlayer.pathY[0] <= var7 + var10 && class408.clientPreferences.areaSoundEffectsVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 7316 7317 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7318 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 7319 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var8; // L: 7320 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7321 + Client.soundLocations[Client.soundEffectCount] = var3 + (var7 << 8) + (var6 << 16); // L: 7322 + ++Client.soundEffectCount; // L: 7323 + } + } + } + + if (class240.field2775 == var0) { // L: 7328 + var2 = var1.method7004(); // L: 7329 + var3 = var1.method7120(); // L: 7330 + var4 = var1.method6995(); // L: 7331 + var5 = (var4 >> 4 & 7) + ItemComposition.field1931; // L: 7332 + var6 = (var4 & 7) + Actor.field1146; // L: 7333 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7334 + var33 = new TileItem(); // L: 7335 + var33.id = var2; // L: 7336 + var33.quantity = var3; // L: 7337 + if (Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6] == null) { // L: 7338 + Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6].addFirst(var33); // L: 7339 + WallDecoration.updateItemPile(var5, var6); // L: 7340 + } + + } else { + if (class240.field2778 == var0) { // L: 7344 + var2 = var1.method7120(); // L: 7345 + var3 = var1.method7006(); // L: 7346 + var4 = var1.method6996(); // L: 7347 + var5 = var4 >> 2; // L: 7348 + var6 = var4 & 3; // L: 7349 + var7 = Client.field530[var5]; // L: 7350 + byte var38 = var1.method6973(); // L: 7351 + byte var40 = var1.method7128(); // L: 7352 + byte var41 = var1.method6973(); // L: 7353 + var11 = var1.method7120(); // L: 7354 + var12 = var1.readUnsignedShort(); // L: 7355 + byte var13 = var1.readByte(); // L: 7356 + var14 = var1.method6995(); // L: 7357 + int var15 = (var14 >> 4 & 7) + ItemComposition.field1931; // L: 7358 + int var16 = (var14 & 7) + Actor.field1146; // L: 7359 + Player var17; + if (var11 == Client.localPlayerIndex) { // L: 7361 + var17 = HealthBarDefinition.localPlayer; + } else { + var17 = Client.players[var11]; // L: 7362 + } + + if (var17 != null) { // L: 7363 + ObjectComposition var18 = KitDefinition.getObjectDefinition(var12); // L: 7364 + int var19; + int var20; + if (var6 != 1 && var6 != 3) { // L: 7367 + var19 = var18.sizeX; // L: 7372 + var20 = var18.sizeY; // L: 7373 + } else { + var19 = var18.sizeY; // L: 7368 + var20 = var18.sizeX; // L: 7369 + } + + int var21 = var15 + (var19 >> 1); // L: 7375 + int var22 = var15 + (var19 + 1 >> 1); // L: 7376 + int var23 = var16 + (var20 >> 1); // L: 7377 + int var24 = var16 + (var20 + 1 >> 1); // L: 7378 + int[][] var25 = Tiles.Tiles_heights[GrandExchangeOfferTotalQuantityComparator.Client_plane]; // L: 7379 + int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; // L: 7380 + int var27 = (var15 << 7) + (var19 << 6); // L: 7381 + int var28 = (var16 << 7) + (var20 << 6); // L: 7382 + Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28); // L: 7383 + if (var29 != null) { // L: 7384 + WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var15, var16, var7, -1, 0, 0, var3 + 1, var2 + 1); // L: 7385 + var17.animationCycleStart = var3 + Client.cycle; // L: 7386 + var17.animationCycleEnd = var2 + Client.cycle; // L: 7387 + var17.model0 = var29; // L: 7388 + var17.field1042 = var19 * 64 + var15 * 128; // L: 7389 + var17.field1052 = var20 * 64 + var16 * 128; // L: 7390 + var17.tileHeight2 = var26; // L: 7391 + byte var30; + if (var41 > var13) { // L: 7392 + var30 = var41; // L: 7393 + var41 = var13; // L: 7394 + var13 = var30; // L: 7395 + } + + if (var38 > var40) { // L: 7397 + var30 = var38; // L: 7398 + var38 = var40; // L: 7399 + var40 = var30; // L: 7400 + } + + var17.minX = var41 + var15; // L: 7402 + var17.maxX = var15 + var13; // L: 7403 + var17.minY = var16 + var38; // L: 7404 + var17.maxY = var40 + var16; // L: 7405 + } + } + } + + if (class240.field2779 == var0) { // L: 7409 + var2 = var1.method7006(); // L: 7410 + var3 = var1.readUnsignedByte(); // L: 7411 + var4 = var1.method7006(); // L: 7412 + var5 = var1.method6996(); // L: 7413 + var6 = (var5 >> 4 & 7) + ItemComposition.field1931; // L: 7414 + var7 = (var5 & 7) + Actor.field1146; // L: 7415 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7416 + var6 = var6 * 128 + 64; // L: 7417 + var7 = var7 * 128 + 64; // L: 7418 + GraphicsObject var32 = new GraphicsObject(var2, GrandExchangeOfferTotalQuantityComparator.Client_plane, var6, var7, class392.getTileHeight(var6, var7, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var3, var4, Client.cycle); // L: 7419 + Client.graphicsObjects.addFirst(var32); // L: 7420 + } + + } else if (class240.field2774 == var0) { // L: 7424 + var2 = var1.readUnsignedShort(); // L: 7425 + var3 = var1.method6996(); // L: 7426 + var4 = (var3 >> 4 & 7) + ItemComposition.field1931; // L: 7427 + var5 = (var3 & 7) + Actor.field1146; // L: 7428 + var6 = var1.method6997(); // L: 7429 + var7 = var6 >> 2; // L: 7430 + var8 = var6 & 3; // L: 7431 + var9 = Client.field530[var7]; // L: 7432 + if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { // L: 7433 + if (var9 == 0) { // L: 7434 + BoundaryObject var31 = GameBuild.scene.method4301(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7435 + if (var31 != null) { // L: 7436 + var11 = Entity_unpackID(var31.tag); // L: 7437 + if (var7 == 2) { // L: 7438 + var31.renderable1 = new DynamicObject(var11, 2, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable1); // L: 7439 + var31.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable2); // L: 7440 + } else { + var31.renderable1 = new DynamicObject(var11, var7, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable1); // L: 7442 + } + } + } + + if (var9 == 1) { // L: 7445 + WallDecoration var43 = GameBuild.scene.method4410(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7446 + if (var43 != null) { // L: 7447 + var11 = Entity_unpackID(var43.tag); // L: 7448 + if (var7 != 4 && var7 != 5) { // L: 7449 + if (var7 == 6) { // L: 7450 + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1); + } else if (var7 == 7) { // L: 7451 + var43.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1); + } else if (var7 == 8) { // L: 7452 + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1); // L: 7453 + var43.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable2); // L: 7454 + } + } else { + var43.renderable1 = new DynamicObject(var11, 4, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1); + } + } + } + + if (var9 == 2) { // L: 7458 + GameObject var44 = GameBuild.scene.getGameObject(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7459 + if (var7 == 11) { // L: 7460 + var7 = 10; + } + + if (var44 != null) { // L: 7461 + var44.renderable = new DynamicObject(Entity_unpackID(var44.tag), var7, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var44.renderable); + } + } + + if (var9 == 3) { // L: 7463 + FloorDecoration var45 = GameBuild.scene.getFloorDecoration(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7464 + if (var45 != null) { // L: 7465 + var45.renderable = new DynamicObject(Entity_unpackID(var45.tag), 22, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var45.renderable); + } + } + } + + } + } } } } + } // L: 7218 7231 7254 7281 7303 7342 7422 7468 7470 - } + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "148255026" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2758, Client.packetWriter.isaacCipher); // L: 11822 + var0.packetBuffer.writeByte(0); // L: 11823 + Client.packetWriter.addNode(var0); // L: 11824 + } // L: 11825 } diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index 29acfc8923..03c9228625 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hc") +@ObfuscatedName("hi") public interface class228 extends class230 { } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 4b479d721b..21746adba3 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -2,23 +2,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hh") public abstract class class229 implements class231 { - @ObfuscatedName("dk") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -3046607098526418011L + intValue = 159985607 ) - static long field2643; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1504963209 - ) - protected int field2645; + protected int field2647; @ObfuscatedSignature( - descriptor = "(Ljz;Lkn;I)V" + descriptor = "(Ljd;Lkz;I)V" ) protected class229(StudioGame var1, Language var2, int var3) { - this.field2645 = var3; - } + this.field2647 = var3; // L: 10 + } // L: 11 } diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java index 9ef1f1887e..eee5e3105c 100644 --- a/runescape-client/src/main/java/class230.java +++ b/runescape-client/src/main/java/class230.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("he") +@ObfuscatedName("hz") public interface class230 { } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index d66968d9e7..eb1ee42924 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hh") +@ObfuscatedName("hy") public interface class231 extends Iterable { } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 0426706cbc..f927266711 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hv") +@ObfuscatedName("hu") public interface class232 { - @ObfuscatedName("l") - void method4582(Object var1); + @ObfuscatedName("i") + void method4651(Object var1); } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index a85e7f00d4..178131f063 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iy") +@ObfuscatedName("ip") public interface class238 { } diff --git a/runescape-client/src/main/java/class240.java b/runescape-client/src/main/java/class240.java index e7d31ffd18..26e6dbfe13 100644 --- a/runescape-client/src/main/java/class240.java +++ b/runescape-client/src/main/java/class240.java @@ -1,76 +1,92 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("ii") public class class240 { - @ObfuscatedName("l") + @ObfuscatedName("pv") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lno;" ) - public static final class240 field2767; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2768; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2769; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2770; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2775; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2772; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2773; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2774; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final class240 field2776; + @Export("HitSplatDefinition_cachedSprites") + static class387 HitSplatDefinition_cachedSprites; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lii;" ) - public static final class240 field2771; + public static final class240 field2782; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2773; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2774; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2775; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2777; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2779; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2778; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2772; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2780; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + public static final class240 field2781; static { - field2767 = new class240(5); - field2768 = new class240(4); - field2769 = new class240(2); - field2770 = new class240(6); - field2775 = new class240(15); - field2772 = new class240(3); - field2773 = new class240(14); - field2774 = new class240(5); - field2776 = new class240(7); - field2771 = new class240(4); + field2782 = new class240(15); // L: 5 + field2773 = new class240(7); // L: 6 + field2774 = new class240(4); // L: 7 + field2775 = new class240(5); // L: 8 + field2777 = new class240(2); // L: 9 + field2779 = new class240(6); // L: 10 + field2778 = new class240(14); // L: 11 + field2772 = new class240(5); // L: 12 + field2780 = new class240(3); // L: 13 + field2781 = new class240(4); // L: 14 } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "5" + garbageValue = "15" ) class240(int var1) { + } // L: 20 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)[Lim;", + garbageValue = "1489383005" + ) + static LoginPacket[] method4711() { + return new LoginPacket[]{LoginPacket.field2897, LoginPacket.field2901, LoginPacket.field2900, LoginPacket.field2899, LoginPacket.field2896, LoginPacket.field2894}; // L: 22 } } diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java index 66b3552b69..4a610c7a78 100644 --- a/runescape-client/src/main/java/class244.java +++ b/runescape-client/src/main/java/class244.java @@ -1,80 +1,35 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("ih") public class class244 { - @ObfuscatedName("at") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lov;" + descriptor = "(ILbp;ZB)I", + garbageValue = "44" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "2061618856" - ) - public static int method4662(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 <= 127) { - ++var2; - } else if (var4 <= 2047) { - var2 += 2; + static int method4727(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4304 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4305 + return 1; // L: 4306 + } else if (var0 != 6801 && var0 != 6802) { // L: 4308 + if (var0 == 6850) { // L: 4312 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4313 + return 1; // L: 4314 + } else if (var0 != 6851 && var0 != 6852) { // L: 4316 + if (var0 == 6853) { // L: 4320 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4321 + return 1; // L: 4322 + } else { + return 2; // L: 4324 + } } else { - var2 += 3; + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4317 + return 1; // L: 4318 } - } - - return var2; - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(Ljt;B)Z", - garbageValue = "-116" - ) - static final boolean method4661(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method4953(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2675, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4309 + return 1; // L: 4310 } } } diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java index b951a6eaa0..ccdd79bf70 100644 --- a/runescape-client/src/main/java/class245.java +++ b/runescape-client/src/main/java/class245.java @@ -1,70 +1,30 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("il") public class class245 { - @ObfuscatedName("l") - static int[] field2899; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ljt;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; + @ObfuscatedName("i") + static int[] field2908; static { new Object(); - field2899 = new int[33]; - field2899[0] = 0; - int var0 = 2; + field2908 = new int[33]; // L: 8 + field2908[0] = 0; // L: 11 + int var0 = 2; // L: 12 for (int var1 = 1; var1 < 33; ++var1) { - field2899[var1] = var0 - 1; - var0 += var0; + field2908[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 } - } + } // L: 17 - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Lfo;", - garbageValue = "-1547455637" + descriptor = "(S)[Ljk;", + garbageValue = "15748" ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2146798091" - ) - static final void method4681() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.method2127(); - } - + static GameBuild[] method4742() { + return new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 13 } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index b63c7f6e61..895d312cb7 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -3,75 +3,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("ir") public class class247 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("q") - @ObfuscatedGetter( - longValue = 3354000453036338827L - ) - static long field2919; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("j") + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lio;" ) @Export("midiPcmStream") public static MidiPcmStream midiPcmStream; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 707697237 + intValue = 1167067929 ) @Export("musicPlayerStatus") public static int musicPlayerStatus; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -413440179 + intValue = 2050223797 ) @Export("musicTrackVolume") public static int musicTrackVolume; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1828900963 + intValue = -609469797 ) @Export("pcmSampleLength") public static int pcmSampleLength; - @ObfuscatedName("y") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lad;" ) @Export("soundCache") public static SoundCache soundCache; + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "Ljf;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; static { - musicPlayerStatus = 0; + musicPlayerStatus = 0; // L: 11 } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "121" + descriptor = "(IIIII)V", + garbageValue = "-1859511667" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; + static final void method4751(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 63 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 64 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 65 + class54.field419[0][var5][var4] = 127; // L: 66 + if (var0 == var5 && var5 > 0) { // L: 67 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { // L: 68 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { // L: 69 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { // L: 70 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } } - return var5; - } + } // L: 74 } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java deleted file mode 100644 index a24110d8fd..0000000000 --- a/runescape-client/src/main/java/class258.java +++ /dev/null @@ -1,28 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ia") -public class class258 { - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "542029233" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = ViewportMouse.getWidgetChild(ModelData0.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - ViewportMouse.runScriptEvent(var1); - } - - Client.field647 = -1; - Client.isSpellSelected = false; - class16.invalidateWidget(var0); - } - } -} diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 209410160f..2087a9d170 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,28 +1,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jx") public class class260 { - @ObfuscatedName("l") - public static final short[] field3034; + @ObfuscatedName("i") + public static final short[] field3035; + @ObfuscatedName("w") + public static final short[][] field3039; + @ObfuscatedName("s") + public static final short[] field3036; + @ObfuscatedName("a") + public static final short[][] field3037; @ObfuscatedName("q") - public static final short[][] field3030; - @ObfuscatedName("f") - public static final short[] field3033; - @ObfuscatedName("j") - public static final short[][] field3031; - @ObfuscatedName("es") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive4") - static Archive archive4; + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; static { - field3034 = new short[]{6798, 8741, 25238, 4626, 4550}; - field3030 = 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}}; - field3033 = new short[]{-10304, 9104, -1, -1, -1}; - field3031 = 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]}; + field3035 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field3039 = 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 + field3036 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field3037 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 } } diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java index e62dbd6e8f..c6e3820b39 100644 --- a/runescape-client/src/main/java/class262.java +++ b/runescape-client/src/main/java/class262.java @@ -1,206 +1,37 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jf") +@ObfuscatedName("jl") public class class262 { - @ObfuscatedName("gp") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "(I)V", + garbageValue = "1378458919" ) - @Export("fontPlain12") - static Font fontPlain12; + static void method5136() { + class392.method6871(ObjectComposition.menuWidth / 2 + SecureRandomCallable.menuX, Frames.menuY); // L: 8227 + } // L: 8228 - @ObfuscatedName("ak") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "49" + descriptor = "(I)V", + garbageValue = "292857439" ) - static int method5063(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; - return 1; - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var12 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class6.grandExchangeEvents != null) { - class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var12 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class6.grandExchangeEvents != null) { - class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var12 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - boolean var11 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1] == 1; - if (class6.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; - class6.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var12 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class6.grandExchangeEvents != null) { - class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var12 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize] == 1; - if (class6.grandExchangeEvents != null) { - class6.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class6.grandExchangeEvents == null ? 0 : class6.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - long var5 = UserComparator4.method2406() - class119.field1395 - 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[++class54.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)class6.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 9134 + Widget var0 = ItemContainer.getWidgetChild(FontName.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9135 + if (var0 != null && var0.onTargetLeave != null) { // L: 9136 + ScriptEvent var1 = new ScriptEvent(); // L: 9137 + var1.widget = var0; // L: 9138 + var1.args = var0.onTargetLeave; // L: 9139 + Tile.runScriptEvent(var1); // L: 9140 } - } - } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "-79" - ) - static int method5062(int var0, Script var1, boolean var2) { - if (var0 == 7100) { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 7101) { - class54.Interpreter_stringStackSize += 2; - return 1; - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { - if (var0 == 7106) { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 7107) { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; - } else if (var0 == 7108) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class268.method5103() ? 1 : 0; - return 1; - } else if (var0 == 7110) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7120) { - --AbstractByteArrayCopier.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7121) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7122) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - return 2; - } - } else { - ++AbstractByteArrayCopier.Interpreter_intStackSize; - return 1; + Client.field627 = -1; // L: 9142 + Client.isSpellSelected = false; // L: 9143 + class184.invalidateWidget(var0); // L: 9144 } - } + } // L: 9145 } diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java index fc53850bbc..cc4f94d07c 100644 --- a/runescape-client/src/main/java/class264.java +++ b/runescape-client/src/main/java/class264.java @@ -1,128 +1,57 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jo") +@ObfuscatedName("jw") public class class264 { - @ObfuscatedName("qe") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llz;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljy;" ) @Export("huffman") - public static Huffman huffman; + static Huffman huffman; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;Lkl;Lig;I)Z", - garbageValue = "455170296" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "1" ) - public static boolean method5077(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class247.musicPatchesArchive = var0; - GrandExchangeOfferWorldComparator.musicSamplesArchive = var1; - class247.soundEffectsArchive = var2; - class247.midiPcmStream = var3; - return true; - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 111 + int var4 = 0; // L: 112 - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-1155481157" - ) - static int method5071(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Client.field744 = (short)Friend.method6004(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]); - if (Client.field744 <= 0) { - Client.field744 = 256; + for (int var5 = 0; var5 < var2; ++var5) { // L: 113 + int var6 = var0[var5 + var1] & 255; // L: 114 + if (var6 != 0) { // L: 115 + if (var6 >= 128 && var6 < 160) { // L: 116 + char var7 = class316.cp1252AsciiExtension[var6 - 128]; // L: 117 + if (var7 == 0) { // L: 118 + var7 = '?'; + } + + var6 = var7; // L: 119 + } + + var3[var4++] = (char)var6; // L: 121 } - - Client.field747 = (short)Friend.method6004(Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]); - if (Client.field747 <= 0) { - Client.field747 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - Client.field748 = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - if (Client.field748 <= 0) { - Client.field748 = 1; - } - - Client.field749 = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - if (Client.field749 <= 0) { - Client.field749 = 32767; - } else if (Client.field749 < Client.field748) { - Client.field749 = Client.field748; - } - - Client.field750 = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - if (Client.field750 <= 0) { - Client.field750 = 1; - } - - Client.field501 = (short)Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - if (Client.field501 <= 0) { - Client.field501 = 32767; - } else if (Client.field501 < Client.field750) { - Client.field501 = Client.field750; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - class130.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class300.method5458(Client.field744); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = class300.method5458(Client.field747); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Huffman.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = MouseRecorder.canvasHeight; - return 1; - } else { - return 2; } + + return new String(var3, 0, var4); // L: 123 } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lop;J)V" + ) + static void method5144(Buffer var0, long var1) { + var1 /= 10L; // L: 63 + if (var1 < 0L) { // L: 64 + var1 = 0L; + } else if (var1 > 65535L) { // L: 65 + var1 = 65535L; + } + + var0.writeShort((int)var1); // L: 66 + } // L: 67 } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index 4d2df752ac..ec7c395d59 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,52 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jn") public class class268 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1895350617" - ) - static void method5104() { - KeyHandler.field145 = new int[2000]; - int var0 = 0; - int var1 = 240; - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = class134.method2708((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); - KeyHandler.field145[var0] = var3; - ++var0; - } - - var1 = 48; - - for (int var5 = var1 / 6; var0 < KeyHandler.field145.length; var1 -= var5) { - var3 = var0 * 2; - - for (int var4 = class134.method2708((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < KeyHandler.field145.length; ++var0) { - KeyHandler.field145[var0] = var4; - } - } - - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-53" - ) - static final boolean method5103() { - return Client.isMenuOpen; - } - - @ObfuscatedName("jg") - static final void method5105(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); - ItemComposition.ItemDefinition_cachedSprites.clear(); - WorldMapDecorationType.clientPreferences.brightness = var0; - ScriptFrame.savePreferences(); - } } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 3a6253afad..5fa4376879 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -3,51 +3,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("je") public enum class269 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lje;" ) - field3217(0), - @ObfuscatedName("q") + field3216(0), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lje;" ) - field3220(1), - @ObfuscatedName("f") + field3217(1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lje;" ) - field3216(2), - @ObfuscatedName("j") + field3218(2), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lje;" ) - field3219(3), - @ObfuscatedName("m") + field3220(3), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lje;" ) - field3224(4); + field3219(4); - @ObfuscatedName("k") + @ObfuscatedName("sg") @ObfuscatedGetter( - intValue = 659223025 + intValue = 681305729 ) - final int field3218; + static int field3221; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -833696691 + ) + final int field3215; class269(int var3) { - this.field3218 = var3; - } + this.field3215 = var3; // L: 14 + } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3218; + return this.field3215; // L: 18 } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "234" + ) + public static int method5190(int var0) { + return class361.field4051[var0 & 16383]; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2127089164" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 27 + if (var4 == null) { // L: 28 + var4 = new ChatChannel(); // L: 29 + Messages.Messages_channels.put(var0, var4); // L: 30 + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 32 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 33 + Messages.Messages_queue.add(var5); // L: 34 + Client.chatCycle = Client.cycleCntr; // L: 35 + } // L: 36 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "6" + ) + public static void method5189() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 54 + } // L: 55 } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 7a478907d0..c4ec98cfab 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -3,23 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("ad") +@ObfuscatedName("ae") public class class27 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1346370498" + garbageValue = "-1032442444" ) - public static void method405(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); - } + public static void method393(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); // L: 13 + } // L: 14 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "2078687871" + garbageValue = "1889226474" ) - public static Object method406(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); + public static Object method394(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 17 } } diff --git a/runescape-client/src/main/java/class272.java b/runescape-client/src/main/java/class272.java index 486caf8526..17584835f4 100644 --- a/runescape-client/src/main/java/class272.java +++ b/runescape-client/src/main/java/class272.java @@ -1,9 +1,627 @@ -import net.runelite.mapping.Export; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("js") public class class272 { - @ObfuscatedName("r") - @Export("userHomeDirectory") - static String userHomeDirectory; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lai;Lle;I)V", + garbageValue = "-740150909" + ) + static void method5197(GameEngine var0, Font var1) { + if (Login.worldSelectOpen) { // L: 322 + PcmPlayer.method757(var0); // L: 323 + } else { + int var4; + if ((MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 326 + class408.clientPreferences.titleMusicDisabled = !class408.clientPreferences.titleMusicDisabled; // L: 327 + Login.savePreferences(); // L: 328 + if (!class408.clientPreferences.titleMusicDisabled) { // L: 329 + Archive var2 = Messages.archive6; // L: 330 + int var3 = var2.getGroupId("scape main"); // L: 332 + var4 = var2.getFileId(var3, ""); // L: 333 + class247.musicPlayerStatus = 1; // L: 335 + class128.musicTrackArchive = var2; // L: 336 + FillMode.musicTrackGroupId = var3; // L: 337 + ArchiveDiskActionHandler.musicTrackFileId = var4; // L: 338 + class247.musicTrackVolume = 255; // L: 339 + SecureRandomCallable.musicTrackBoolean = false; // L: 340 + class247.pcmSampleLength = 10000; // L: 341 + } else { + WorldMapCacheName.method4027(); // L: 345 + } + } + + if (Client.gameState != 5) { // L: 347 + if (Login.field876 == -1L) { // L: 348 + Login.field876 = class111.method2516() + 1000L; // L: 349 + } + + long var16 = class111.method2516(); // L: 351 + if (Client.method1643() && Login.field884 == -1L) { // L: 352 353 + Login.field884 = var16; // L: 354 + if (Login.field884 > Login.field876) { // L: 355 + Login.field876 = Login.field884; // L: 356 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 360 + if (MouseHandler.clientLanguage == Language.Language_EN) { // L: 361 + if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 362 + var4 = Login.xPadding + 5; // L: 363 + short var5 = 463; // L: 364 + byte var6 = 100; // L: 365 + byte var7 = 35; // L: 366 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { // L: 367 + if (MusicPatch.loadWorlds()) { // L: 369 + Login.worldSelectOpen = true; // L: 370 + Login.worldSelectPage = 0; // L: 371 + Login.worldSelectPagesCount = 0; // L: 372 + } + + return; // L: 375 + } + } + + if (class21.World_request != null && MusicPatch.loadWorlds()) { // L: 378 379 + Login.worldSelectOpen = true; // L: 380 + Login.worldSelectPage = 0; // L: 381 + Login.worldSelectPagesCount = 0; // L: 382 + } + } + + var4 = MouseHandler.MouseHandler_lastButton; // L: 386 + int var25 = MouseHandler.MouseHandler_lastPressedX; // L: 387 + int var26 = MouseHandler.MouseHandler_lastPressedY; // L: 388 + if (var4 == 0) { // L: 389 + var25 = MouseHandler.MouseHandler_x; // L: 390 + var26 = MouseHandler.MouseHandler_y; // L: 391 + } + + if (!ApproximateRouteStrategy.mouseCam && var4 == 4) { // L: 393 + var4 = 1; + } + + short var29; + int var31; + if (Login.loginIndex == 0) { // L: 394 + boolean var33 = false; // L: 395 + + while (WorldMapElement.isKeyDown()) { // L: 396 + if (class12.field55 == 84) { // L: 397 + var33 = true; // L: 398 + } + } + + var31 = Login.loginBoxCenter - 80; // L: 401 + var29 = 291; // L: 402 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 403 + class91.openURL(HealthBar.method2246("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 404 + } + + var31 = Login.loginBoxCenter + 80; // L: 406 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20 || var33) { // L: 407 + if ((Client.worldProperties & 33554432) != 0) { // L: 408 + Login.Login_response0 = ""; // L: 409 + Login.Login_response1 = "This is a Beta world."; // L: 410 + Login.Login_response2 = "Your normal account will not be affected."; // L: 411 + Login.Login_response3 = ""; // L: 412 + class275.method5201(1); // L: 413 + ParamComposition.method3216(); // L: 414 + } else if ((Client.worldProperties & 4) != 0) { // L: 416 + if ((Client.worldProperties & 1024) != 0) { // L: 417 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 418 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 419 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 420 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 423 + Login.Login_response2 = "Players can attack each other"; // L: 424 + Login.Login_response3 = "almost everywhere."; // L: 425 + } + + Login.Login_response0 = "Warning!"; // L: 427 + class275.method5201(1); // L: 428 + ParamComposition.method3216(); // L: 429 + } else if ((Client.worldProperties & 1024) != 0) { // L: 431 + Login.Login_response1 = "This is a High Risk world."; // L: 432 + Login.Login_response2 = "The Protect Item prayer will"; // L: 433 + Login.Login_response3 = "not work on this world."; // L: 434 + Login.Login_response0 = "Warning!"; // L: 435 + class275.method5201(1); // L: 436 + ParamComposition.method3216(); // L: 437 + } else { + class1.Login_promptCredentials(false); // L: 440 + } + } + } else { + short var8; + int var27; + if (Login.loginIndex == 1) { // L: 444 + while (true) { + if (!WorldMapElement.isKeyDown()) { // L: 445 + var27 = Login.loginBoxCenter - 80; // L: 453 + var8 = 321; // L: 454 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 455 + class1.Login_promptCredentials(false); // L: 456 + } + + var27 = Login.loginBoxCenter + 80; // L: 458 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 459 + class275.method5201(0); // L: 460 + } + break; + } + + if (class12.field55 == 84) { // L: 446 + class1.Login_promptCredentials(false); // L: 447 + } else if (class12.field55 == 13) { // L: 449 + class275.method5201(0); // L: 450 + } + } + } else { + int var11; + short var28; + if (Login.loginIndex == 2) { // L: 463 + var28 = 201; // L: 464 + var27 = var28 + 52; // L: 465 + if (var4 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 466 + Login.currentLoginField = 0; + } + + var27 += 15; // L: 467 + if (var4 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 468 + Login.currentLoginField = 1; + } + + var27 += 15; // L: 469 + var28 = 361; // L: 470 + if (class114.field1359 != null) { // L: 471 + var31 = class114.field1359.highX / 2; // L: 472 + if (var4 == 1 && var25 >= class114.field1359.lowX - var31 && var25 <= var31 + class114.field1359.lowX && var26 >= var28 - 15 && var26 < var28) { // L: 473 + switch(Login.field865) { // L: 474 + case 1: + class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 482 + class275.method5201(5); // L: 483 + return; // L: 484 + case 2: + class91.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 477 + } + } + } + + var31 = Login.loginBoxCenter - 80; // L: 489 + var29 = 321; // L: 490 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 491 + Login.Login_username = Login.Login_username.trim(); // L: 492 + if (Login.Login_username.length() == 0) { // L: 493 + class1.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 494 + return; // L: 495 + } + + if (Login.Login_password.length() == 0) { // L: 497 + class1.setLoginResponseString("", "Please enter your password.", ""); // L: 498 + return; // L: 499 + } + + class1.setLoginResponseString("", "Connecting to server...", ""); // L: 501 + WorldMapSection2.method3584(false); // L: 502 + WorldMapData_1.updateGameState(20); // L: 503 + return; // L: 504 + } + + var31 = Login.loginBoxX + 180 + 80; // L: 506 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 507 + class275.method5201(0); // L: 508 + Login.Login_username = ""; // L: 509 + Login.Login_password = ""; // L: 510 + ReflectionCheck.field429 = 0; // L: 511 + Tiles.otp = ""; // L: 512 + Login.field875 = true; // L: 513 + } + + var31 = Login.loginBoxCenter + -117; // L: 515 + var29 = 277; // L: 516 + Login.field873 = var25 >= var31 && var25 < var31 + class327.field3908 && var26 >= var29 && var26 < var29 + UserComparator9.field1326; // L: 517 + if (var4 == 1 && Login.field873) { // L: 518 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 519 + if (!Client.Login_isUsernameRemembered && class408.clientPreferences.rememberedUsername != null) { // L: 520 + class408.clientPreferences.rememberedUsername = null; // L: 521 + Login.savePreferences(); // L: 522 + } + } + + var31 = Login.loginBoxCenter + 24; // L: 525 + var29 = 277; // L: 526 + Login.field860 = var25 >= var31 && var25 < var31 + class327.field3908 && var26 >= var29 && var26 < var29 + UserComparator9.field1326; // L: 527 + if (var4 == 1 && Login.field860) { // L: 528 + class408.clientPreferences.hideUsername = !class408.clientPreferences.hideUsername; // L: 529 + if (!class408.clientPreferences.hideUsername) { // L: 530 + Login.Login_username = ""; // L: 531 + class408.clientPreferences.rememberedUsername = null; // L: 532 + ParamComposition.method3216(); // L: 533 + } + + Login.savePreferences(); // L: 535 + } + + while (true) { + int var12; + Transferable var35; + do { + while (true) { + label1030: + do { + while (true) { + while (WorldMapElement.isKeyDown()) { // L: 537 + if (class12.field55 != 13) { // L: 538 + if (Login.currentLoginField != 0) { // L: 547 + continue label1030; + } + + char var32 = class319.field3858; // L: 548 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var32 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 550 551 + } + + if (class12.field55 == 85 && Login.Login_username.length() > 0) { // L: 554 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class12.field55 == 84 || class12.field55 == 80) { // L: 555 + Login.currentLoginField = 1; + } + + if (DynamicObject.method2001(class319.field3858) && Login.Login_username.length() < 320) { // L: 556 + Login.Login_username = Login.Login_username + class319.field3858; + } + } else { + class275.method5201(0); // L: 539 + Login.Login_username = ""; // L: 540 + Login.Login_password = ""; // L: 541 + ReflectionCheck.field429 = 0; // L: 542 + Tiles.otp = ""; // L: 543 + Login.field875 = true; // L: 544 + } + } + + return; // L: 854 + } + } while(Login.currentLoginField != 1); // L: 558 + + if (class12.field55 == 85 && Login.Login_password.length() > 0) { // L: 559 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 560 + } else if (class12.field55 == 84 || class12.field55 == 80) { // L: 562 + Login.currentLoginField = 0; // L: 563 + if (class12.field55 == 84) { // L: 564 + Login.Login_username = Login.Login_username.trim(); // L: 565 + if (Login.Login_username.length() == 0) { // L: 566 + class1.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 567 + return; // L: 568 + } + + if (Login.Login_password.length() == 0) { // L: 570 + class1.setLoginResponseString("", "Please enter your password.", ""); // L: 571 + return; // L: 572 + } + + class1.setLoginResponseString("", "Connecting to server...", ""); // L: 574 + WorldMapSection2.method3584(false); // L: 575 + WorldMapData_1.updateGameState(20); // L: 576 + return; // L: 577 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class12.field55 == 67) { // L: 580 + Clipboard var34 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 581 + var35 = var34.getContents(ArchiveLoader.client); // L: 582 + var12 = 20 - Login.Login_password.length(); // L: 583 + break; + } + + if (GrandExchangeOffer.method5473(class319.field3858) && DynamicObject.method2001(class319.field3858) && Login.Login_password.length() < 20) { // L: 600 + Login.Login_password = Login.Login_password + class319.field3858; // L: 601 + } + } + } while(var12 <= 0); // L: 584 + + try { + String var13 = (String)var35.getTransferData(DataFlavor.stringFlavor); // L: 586 + int var14 = Math.min(var12, var13.length()); // L: 587 + + for (int var15 = 0; var15 < var14; ++var15) { // L: 588 + if (!GrandExchangeOffer.method5473(var13.charAt(var15)) || !DynamicObject.method2001(var13.charAt(var15))) { // L: 589 + class275.method5201(3); // L: 590 + return; // L: 591 + } + } + + Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 594 + } catch (UnsupportedFlavorException var23) { // L: 596 + } catch (IOException var24) { // L: 597 + } + } + } else if (Login.loginIndex == 3) { // L: 607 + var27 = Login.loginBoxX + 180; // L: 608 + var8 = 276; // L: 609 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 610 + EnumComposition.method3097(false); // L: 611 + } + + var27 = Login.loginBoxX + 180; // L: 613 + var8 = 326; // L: 614 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 615 + class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 616 + class275.method5201(5); // L: 617 + return; // L: 618 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 621 + var27 = Login.loginBoxX + 180 - 80; // L: 622 + var8 = 321; // L: 623 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 624 + Tiles.otp.trim(); // L: 625 + if (Tiles.otp.length() != 6) { // L: 626 + class1.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 627 + return; // L: 628 + } + + ReflectionCheck.field429 = Integer.parseInt(Tiles.otp); // L: 630 + Tiles.otp = ""; // L: 631 + WorldMapSection2.method3584(true); // L: 632 + class1.setLoginResponseString("", "Connecting to server...", ""); // L: 633 + WorldMapData_1.updateGameState(20); // L: 634 + return; // L: 635 + } + + if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var26 >= 263 && var26 <= 296) { // L: 637 + Login.field875 = !Login.field875; // L: 638 + } + + if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var26 >= 351 && var26 <= 363) { // L: 640 + class91.openURL(HealthBar.method2246("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 641 + } + + var27 = Login.loginBoxX + 180 + 80; // L: 643 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 644 + class275.method5201(0); // L: 645 + Login.Login_username = ""; // L: 646 + Login.Login_password = ""; // L: 647 + ReflectionCheck.field429 = 0; // L: 648 + Tiles.otp = ""; // L: 649 + } + + while (WorldMapElement.isKeyDown()) { // L: 651 + boolean var9 = false; // L: 652 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 653 + if (class319.field3858 == "1234567890".charAt(var10)) { // L: 654 + var9 = true; // L: 655 + break; // L: 656 + } + } + + if (class12.field55 == 13) { // L: 659 + class275.method5201(0); // L: 660 + Login.Login_username = ""; // L: 661 + Login.Login_password = ""; // L: 662 + ReflectionCheck.field429 = 0; // L: 663 + Tiles.otp = ""; // L: 664 + } else { + if (class12.field55 == 85 && Tiles.otp.length() > 0) { // L: 667 + Tiles.otp = Tiles.otp.substring(0, Tiles.otp.length() - 1); + } + + if (class12.field55 == 84) { // L: 668 + Tiles.otp.trim(); // L: 669 + if (Tiles.otp.length() != 6) { // L: 670 + class1.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 671 + return; // L: 672 + } + + ReflectionCheck.field429 = Integer.parseInt(Tiles.otp); // L: 674 + Tiles.otp = ""; // L: 675 + WorldMapSection2.method3584(true); // L: 676 + class1.setLoginResponseString("", "Connecting to server...", ""); // L: 677 + WorldMapData_1.updateGameState(20); // L: 678 + return; // L: 679 + } + + if (var9 && Tiles.otp.length() < 6) { // L: 681 + Tiles.otp = Tiles.otp + class319.field3858; + } + } + } + } else if (Login.loginIndex == 5) { // L: 685 + var27 = Login.loginBoxX + 180 - 80; // L: 686 + var8 = 321; // L: 687 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 688 + Occluder.method4482(); // L: 689 + return; // L: 690 + } + + var27 = Login.loginBoxX + 180 + 80; // L: 692 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 693 + class1.Login_promptCredentials(true); // L: 694 + } + + var29 = 361; // L: 696 + if (ItemContainer.field998 != null) { // L: 697 + var10 = ItemContainer.field998.highX / 2; // L: 698 + if (var4 == 1 && var25 >= ItemContainer.field998.lowX - var10 && var25 <= var10 + ItemContainer.field998.lowX && var26 >= var29 - 15 && var26 < var29) { // L: 699 + class91.openURL(HealthBar.method2246("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 700 + } + } + + while (WorldMapElement.isKeyDown()) { // L: 703 + boolean var30 = false; // L: 704 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 705 + if (class319.field3858 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 706 + var30 = true; // L: 707 + break; // L: 708 + } + } + + if (class12.field55 == 13) { // L: 711 + class1.Login_promptCredentials(true); // L: 712 + } else { + if (class12.field55 == 85 && Login.Login_username.length() > 0) { // L: 715 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class12.field55 == 84) { // L: 716 + Occluder.method4482(); // L: 717 + return; // L: 718 + } + + if (var30 && Login.Login_username.length() < 320) { // L: 720 + Login.Login_username = Login.Login_username + class319.field3858; + } + } + } + } else if (Login.loginIndex != 6) { // L: 724 + if (Login.loginIndex == 7) { // L: 735 + var27 = Login.loginBoxX + 180 - 80; // L: 736 + var8 = 321; // L: 737 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 738 + class91.openURL(HealthBar.method2246("secure", true) + "m=dob/set_dob.ws", true, false); // L: 739 + class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 740 + class275.method5201(6); // L: 741 + return; // L: 742 + } + + var27 = Login.loginBoxX + 180 + 80; // L: 744 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 745 + class1.Login_promptCredentials(true); // L: 746 + } + } else if (Login.loginIndex == 8) { // L: 749 + var27 = Login.loginBoxX + 180 - 80; // L: 750 + var8 = 321; // L: 751 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 752 + class91.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 753 + class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 754 + class275.method5201(6); // L: 755 + return; // L: 756 + } + + var27 = Login.loginBoxX + 180 + 80; // L: 758 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 759 + class1.Login_promptCredentials(true); // L: 760 + } + } else if (Login.loginIndex == 9) { // L: 763 + var27 = Login.loginBoxX + 180; // L: 764 + var8 = 311; // L: 765 + if (class12.field55 == 84 || class12.field55 == 13 || var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 766 + EnumComposition.method3097(false); // L: 767 + } + } else if (Login.loginIndex == 10) { // L: 770 + var27 = Login.loginBoxX + 180; // L: 771 + var8 = 209; // L: 772 + if (class12.field55 == 84 || var4 == 1 && var25 >= var27 - 109 && var25 <= var27 + 109 && var26 >= var8 && var26 <= var8 + 68) { // L: 773 + class1.setLoginResponseString("", "Connecting to server...", ""); // L: 774 + Client.field500 = class404.field4352; // L: 775 + WorldMapSection2.method3584(false); // L: 776 + WorldMapData_1.updateGameState(20); // L: 777 + } + } else if (Login.loginIndex == 12) { // L: 780 + var27 = Login.loginBoxCenter; // L: 781 + var8 = 233; // L: 782 + Bounds var20 = var1.method5745(0, 30, "terms of use, privacy policy, and end user licence", var27, var8); // L: 783 + Bounds var18 = var1.method5745(32, 32, "terms of use, privacy policy, and end user licence", var27, var8); // L: 784 + Bounds var19 = var1.method5745(70, 34, "terms of use, privacy policy, and end user licence", var27, var8); // L: 785 + var31 = var8 + 17; // L: 786 + Bounds var21 = var1.method5745(0, 34, "agreement (EULA).", var27, var31); // L: 787 + if (var4 == 1) { // L: 788 + if (var20.method6341(var25, var26)) { // L: 789 + class91.openURL("https://www.jagex.com/terms", true, false); // L: 790 + } else if (var18.method6341(var25, var26)) { // L: 792 + class91.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 793 + } else if (var19.method6341(var25, var26) || var21.method6341(var25, var26)) { // L: 795 + class91.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 796 + } + } + + var27 = Login.loginBoxCenter - 80; // L: 799 + var8 = 311; // L: 800 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 801 + class408.clientPreferences.field1182 = Client.field467; // L: 803 + Login.savePreferences(); // L: 804 + EnumComposition.method3097(true); // L: 806 + } + + var27 = Login.loginBoxCenter + 80; // L: 808 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 809 + Login.loginIndex = 13; // L: 810 + } + } else if (Login.loginIndex == 13) { // L: 813 + var27 = Login.loginBoxCenter; // L: 814 + var8 = 321; // L: 815 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 816 + EnumComposition.method3097(true); // L: 817 + } + } else if (Login.loginIndex == 14) { // L: 820 + String var22 = ""; // L: 821 + switch(Login.field866) { // L: 822 + case 0: + var22 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 827 + break; // L: 828 + case 1: + var22 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 830 + break; + default: + class1.Login_promptCredentials(false); // L: 824 + } + + var31 = Login.loginBoxX + 180; // L: 833 + var29 = 276; // L: 834 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 835 + class91.openURL(var22, true, false); // L: 836 + class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 837 + class275.method5201(6); // L: 838 + return; // L: 839 + } + + var31 = Login.loginBoxX + 180; // L: 841 + var29 = 326; // L: 842 + if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 843 + class1.Login_promptCredentials(false); // L: 844 + } + } else if (Login.loginIndex == 24) { // L: 847 + var27 = Login.loginBoxX + 180; // L: 848 + var8 = 301; // L: 849 + if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 850 + EnumComposition.method3097(false); // L: 851 + } + } + } else { + while (true) { + do { + if (!WorldMapElement.isKeyDown()) { // L: 725 + var28 = 321; // L: 730 + if (var4 == 1 && var26 >= var28 - 20 && var26 <= var28 + 20) { // L: 731 + class1.Login_promptCredentials(true); // L: 732 + } + + return; + } + } while(class12.field55 != 84 && class12.field55 != 13); // L: 726 + + class1.Login_promptCredentials(true); // L: 727 + } + } + } + } + } + + } + } + } + } // L: 324 } diff --git a/runescape-client/src/main/java/class274.java b/runescape-client/src/main/java/class274.java index 972c321b1f..dc30f12c80 100644 --- a/runescape-client/src/main/java/class274.java +++ b/runescape-client/src/main/java/class274.java @@ -2,117 +2,58 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jg") public final class class274 { - @ObfuscatedName("f") + @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "([Lbc;II[I[II)V", - garbageValue = "726094210" + descriptor = "Ljf;" ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("my") + @ObfuscatedSignature( + descriptor = "Lbu;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(BI)C", + garbageValue = "-1659224646" + ) + public static char method5199(byte var0) { + int var1 = var0 & 255; // L: 63 + if (var1 == 0) { // L: 64 + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { // L: 65 + char var2 = class316.cp1252AsciiExtension[var1 - 128]; // L: 66 + if (var2 == 0) { // L: 67 + var2 = '?'; } + + var1 = var2; // L: 68 } - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + return (char)var1; // L: 70 + } + } + + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "(Lop;II)V", + garbageValue = "2095914687" + ) + static void method5198(Buffer var0, int var1) { + MilliClock.method2954(var0.array, var1); // L: 11985 + if (JagexCache.JagexCache_randomDat != null) { // L: 11987 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 11989 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11990 + } catch (Exception var3) { // L: 11992 + } } - } + } // L: 11995 } diff --git a/runescape-client/src/main/java/class275.java b/runescape-client/src/main/java/class275.java index 822b7dbe0c..0e09a78d8c 100644 --- a/runescape-client/src/main/java/class275.java +++ b/runescape-client/src/main/java/class275.java @@ -2,192 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jm") public class class275 { static { - Math.sqrt(8192.0D); - } + Math.sqrt(8192.0D); // L: 9 + } // L: 10 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-1" + descriptor = "(II)Lft;", + garbageValue = "814359480" ) - static int method5120(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(Lfg;IIII)V", - garbageValue = "67788539" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructComposition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); } - if (var0 != null) { - if (var0.isInteractable) { - if (!var0.isFollower || Client.followerIndex == var1) { - String var4 = var0.name; - int var7; - int var8; - if (var0.combatLevel != 0) { - var7 = var0.combatLevel; - var8 = class67.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = FloorUnderlayDefinition.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = FloorUnderlayDefinition.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = FloorUnderlayDefinition.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = FloorUnderlayDefinition.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = FloorUnderlayDefinition.colorStartTag(65280); - } else if (var9 > 6) { - var6 = FloorUnderlayDefinition.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = FloorUnderlayDefinition.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = FloorUnderlayDefinition.colorStartTag(12648192); - } else { - var6 = FloorUnderlayDefinition.colorStartTag(16776960); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - GameBuild.insertMenuItemNoShift("Examine", FloorUnderlayDefinition.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - GameBuild.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ObjectComposition.selectedSpellFlags & 2) == 2) { - GameBuild.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FloorUnderlayDefinition.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var11 = var0.actions; - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var10 + 9; - } - - if (var7 == 1) { - var8 = var10 + 10; - } - - if (var7 == 2) { - var8 = var10 + 11; - } - - if (var7 == 3) { - var8 = var10 + 12; - } - - if (var7 == 4) { - var8 = var10 + 13; - } - - GameBuild.insertMenuItemNoShift(var11[var7], FloorUnderlayDefinition.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { - short var12 = 0; - if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > class67.localPlayer.combatLevel) { - var12 = 2000; - } - - var8 = 0; - if (var7 == 0) { - var8 = var12 + 9; - } - - if (var7 == 1) { - var8 = var12 + 10; - } - - if (var7 == 2) { - var8 = var12 + 11; - } - - if (var7 == 3) { - var8 = var12 + 12; - } - - if (var7 == 4) { - var8 = var12 + 13; - } - - GameBuild.insertMenuItemNoShift(var11[var7], FloorUnderlayDefinition.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - GameBuild.insertMenuItemNoShift("Examine", FloorUnderlayDefinition.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } + var1.postDecode(); // L: 28 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 } } - @ObfuscatedName("kx") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1085415659" + descriptor = "(II)V", + garbageValue = "1060488561" ) - static final void method5121(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : GrandExchangeOfferNameComparator.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method2729()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketWriter var5 = Client.packetWriter; - PacketBufferNode var6 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2694, var5.isaacCipher); - var6.packetBuffer.writeByte(3 + class113.stringCp1252NullTerminatedByteSize(var4)); - var6.packetBuffer.writeByte(var0); - var6.packetBuffer.writeShort(var1); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - var5.addNode(var6); - } + static void method5201(int var0) { + if (var0 != Login.loginIndex) { // L: 1621 + Login.loginIndex = var0; // L: 1622 } - } + } // L: 1623 } diff --git a/runescape-client/src/main/java/class276.java b/runescape-client/src/main/java/class276.java index 0ebb4efd94..e9cd054286 100644 --- a/runescape-client/src/main/java/class276.java +++ b/runescape-client/src/main/java/class276.java @@ -2,46 +2,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("jp") public class class276 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljp;" ) - static final class276 field3288; - @ObfuscatedName("q") + static final class276 field3282; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljp;" ) - static final class276 field3289; - @ObfuscatedName("f") + static final class276 field3280; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 508241625 + intValue = 1562097245 ) - final int field3287; - @ObfuscatedName("j") + final int field3279; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -259156431 + intValue = 427612801 ) - final int field3290; + final int field3281; static { - field3288 = new class276(51, 27, 800, 0, 16, 16); - field3289 = new class276(25, 28, 800, 656, 40, 40); + field3282 = new class276(51, 27, 800, 0, 16, 16); // L: 33 + field3280 = new class276(25, 28, 800, 656, 40, 40); // L: 34 } class276(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3287 = var5; - this.field3290 = var6; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2081287191" - ) - public static void method5122() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - } + this.field3279 = var5; // L: 39 + this.field3281 = var6; // L: 40 + } // L: 41 } diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 9f3f53cc9f..62ff724bd2 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -1,82 +1,38 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jw") +@ObfuscatedName("jo") public class class279 { - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-176182481" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "228808320" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3891) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3892) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3899) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.field3890 < ByteArrayPool.field3897) { - ByteArrayPool.field3898[++ByteArrayPool.field3890 - 1] = var0; - } else { - if (class117.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == GrandExchangeOfferUnitPriceComparator.ByteArrayPool_alternativeSizes[var1] && Message.ByteArrayPool_altSizeArrayCounts[var1] < class117.ByteArrayPool_arrays[var1].length) { - class117.ByteArrayPool_arrays[var1][Message.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } + static final void method5217(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 121 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your ignore list first").toString(); + class397.addGameMessage(30, "", var1); // L: 123 + } // L: 125 + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1977280908" + ) + static void method5216() { + if (ClanSettings.field1440 != null) { // L: 12045 + Client.field742 = Client.cycle; // L: 12046 + ClanSettings.field1440.method5490(); // L: 12047 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12048 + if (Client.players[var0] != null) { // L: 12049 + ClanSettings.field1440.method5498((Client.players[var0].x >> 7) + class19.baseX, (Client.players[var0].y >> 7) + DefaultsGroup.baseY); // L: 12050 } } - } - } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1917653548" - ) - public static int method5134(CharSequence var0) { - return Language.method5477(var0, 10, true); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILbe;ZI)I", - garbageValue = "-1269647448" - ) - static int method5136(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var5 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var5 = HealthBarUpdate.getWidget(Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]); - if (var5.itemId != -1) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else { - return 2; - } - } + } // L: 12054 } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index 0fcf865e38..66687ec998 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,30 +1,914 @@ +import java.awt.FontMetrics; +import java.util.Date; import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("as") +@ObfuscatedName("aq") public class class28 { - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("hb") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + @ObfuscatedName("g") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("am") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; static { - ImageIO.setUseCache(false); + ImageIO.setUseCache(false); // L: 12 + } // L: 13 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lko;B)V", + garbageValue = "-86" + ) + public static void method405(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lko;I)V", + garbageValue = "1798732043" + ) + public static void method400(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; // L: 21 + } // L: 22 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-1720106594" + ) + static char method399(char var0) { + if (var0 == 198) { // L: 95 + return 'E'; + } else if (var0 == 230) { // L: 96 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 97 + } else if (var0 == 338) { // L: 98 + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 + } } - @ObfuscatedName("aw") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-487974188" + descriptor = "(ILbp;ZI)I", + garbageValue = "765864146" ) - public static int method414(String var0) { - return var0.length() + 2; + static int method401(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3059 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3060 + var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3061 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3062 + return 1; // L: 3063 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 3065 + class295.Interpreter_stringStackSize -= 2; // L: 3066 + var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3067 + var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3068 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3069 + return 1; // L: 3070 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3072 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3073 + var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3074 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + MusicPatchNode2.intToString(var9, true); // L: 3075 + return 1; // L: 3076 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3078 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3079 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3080 + return 1; // L: 3081 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 3083 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3084 + long var13 = (11745L + (long)var10) * 86400000L; // L: 3085 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3086 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 3087 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3088 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3089 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3090 + return 1; // L: 3091 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3093 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3101 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3102 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3103 + return 1; // L: 3104 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3106 + class295.Interpreter_stringStackSize -= 2; // L: 3107 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.method2047(AttackOption.compareStrings(Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1], MouseHandler.clientLanguage)); // L: 3108 + return 1; // L: 3109 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3111 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3112 + class14.Interpreter_intStackSize -= 2; // L: 3113 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3114 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3115 + var11 = LoginScreenAnimation.archive13.takeFile(var5, 0); // L: 3116 + var12 = new Font(var11); // L: 3117 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3118 + return 1; // L: 3119 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3121 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3122 + class14.Interpreter_intStackSize -= 2; // L: 3123 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3124 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3125 + var11 = LoginScreenAnimation.archive13.takeFile(var5, 0); // L: 3126 + var12 = new Font(var11); // L: 3127 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3128 + return 1; // L: 3129 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3131 + class295.Interpreter_stringStackSize -= 2; // L: 3132 + var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3133 + var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3134 + if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 3135 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4; // L: 3136 + } + + return 1; // L: 3137 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3139 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3140 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3141 + return 1; // L: 3142 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3144 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3145 + var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3146 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3147 + return 1; // L: 3148 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3150 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3151 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Skills.isCharPrintable((char)var10) ? 1 : 0; // L: 3152 + return 1; // L: 3153 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3155 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3156 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ObjectComposition.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3157 + return 1; // L: 3158 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3160 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3161 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SpriteMask.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3162 + return 1; // L: 3163 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3165 + var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3166 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class117.isDigit((char)var10) ? 1 : 0; // L: 3167 + return 1; // L: 3168 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3170 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3171 + if (var3 != null) { // L: 3172 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3173 + } + + return 1; // L: 3174 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3176 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3177 + class14.Interpreter_intStackSize -= 2; // L: 3178 + var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3179 + var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3180 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3181 + return 1; // L: 3182 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3184 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3185 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3186 + boolean var16 = false; // L: 3187 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3188 + char var7 = var3.charAt(var6); // L: 3189 + if (var7 == '<') { // L: 3190 + var16 = true; + } else if (var7 == '>') { // L: 3191 + var16 = false; + } else if (!var16) { // L: 3192 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3194 + return 1; // L: 3195 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3197 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3198 + var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3199 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3200 + return 1; // L: 3201 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3203 + class295.Interpreter_stringStackSize -= 2; // L: 3204 + var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3205 + var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3206 + var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3207 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3208 + return 1; // L: 3209 + } else if (var0 == 4122) { // L: 3211 + var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3212 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3213 + return 1; // L: 3214 + } else { + return 2; // L: 3216 + } + } + } else { + class295.Interpreter_stringStackSize -= 2; // L: 3094 + var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3095 + var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3096 + if (HealthBarDefinition.localPlayer.appearance != null && HealthBarDefinition.localPlayer.appearance.isFemale) { // L: 3097 + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3; // L: 3098 + } + + return 1; // L: 3099 + } + } + } } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-320587085" + ) + static int method402(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4432 + class14.Interpreter_intStackSize -= 5; // L: 4433 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4434 + return 1; // L: 4435 + } else if (var0 == 7204) { // L: 4437 + class14.Interpreter_intStackSize -= 6; // L: 4438 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4439 + return 1; // L: 4440 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4442 + Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = -1; // L: 4443 + return 1; // L: 4444 + } else if (var0 == 7209) { // L: 4446 + class14.Interpreter_intStackSize -= 2; // L: 4447 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4448 + return 1; // L: 4449 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4451 + --class14.Interpreter_intStackSize; // L: 4452 + return 1; // L: 4453 + } else if (var0 == 7214) { // L: 4455 + class14.Interpreter_intStackSize -= 2; // L: 4456 + return 1; // L: 4457 + } else { + return 2; // L: 4459 + } + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "644552433" + ) + static final int method404() { + if (class408.clientPreferences.roofsHidden) { // L: 5121 + return GrandExchangeOfferTotalQuantityComparator.Client_plane; + } else { + int var0 = class392.getTileHeight(WorldMapSectionType.cameraX, class65.cameraZ, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5122 + return var0 - class174.cameraY < 800 && (Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][WorldMapSectionType.cameraX >> 7][class65.cameraZ >> 7] & 4) != 0 ? GrandExchangeOfferTotalQuantityComparator.Client_plane : 3; // L: 5123 5124 + } + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "([Ljf;IIIIIIIII)V", + garbageValue = "-973397916" + ) + @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: 9693 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9694 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9695 + Widget var10 = var0[var9]; // L: 9696 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9697 9698 + int var11; + if (var8 == -1) { // L: 9700 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9701 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9702 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9703 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9704 + var11 = ++Client.rootWidgetCount - 1; // L: 9705 + } else { + var11 = var8; // L: 9707 + } + + var10.rootIndex = var11; // L: 9708 + var10.cycle = Client.cycle; // L: 9709 + if (!var10.isIf3 || !Varcs.isComponentHidden(var10)) { // L: 9710 + if (var10.contentType > 0) { // L: 9711 + class137.method2826(var10); + } + + int var12 = var10.x + var6; // L: 9712 + int var13 = var7 + var10.y; // L: 9713 + int var14 = var10.transparencyTop; // L: 9714 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9715 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9716 + NPC.field1207 = var0; // L: 9717 + Varcs.field1263 = var6; // L: 9718 + class150.field1604 = var7; // L: 9719 + continue; // L: 9720 + } + + if (Client.isDraggingWidget && Client.field648) { // L: 9722 + var15 = MouseHandler.MouseHandler_x; // L: 9723 + var16 = MouseHandler.MouseHandler_y; // L: 9724 + var15 -= Client.widgetClickX; // L: 9725 + var16 -= Client.widgetClickY; // L: 9726 + if (var15 < Client.field649) { // L: 9727 + var15 = Client.field649; + } + + if (var15 + var10.width > Client.field649 + Client.clickedWidgetParent.width) { // L: 9728 + var15 = Client.field649 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field650) { // L: 9729 + var16 = Client.field650; + } + + if (var16 + var10.height > Client.field650 + Client.clickedWidgetParent.height) { // L: 9730 + var16 = Client.field650 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9731 + var13 = var16; // L: 9732 + } + + if (!var10.isScrollBar) { // L: 9734 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9740 + var15 = var2; // L: 9741 + var16 = var3; // L: 9742 + var17 = var4; // L: 9743 + var18 = var5; // L: 9744 + } else if (var10.type == 9) { // L: 9746 + var19 = var12; // L: 9747 + var20 = var13; // L: 9748 + var21 = var12 + var10.width; // L: 9749 + var22 = var13 + var10.height; // L: 9750 + if (var21 < var12) { // L: 9751 + var19 = var21; // L: 9753 + var21 = var12; // L: 9754 + } + + if (var22 < var13) { // L: 9756 + var20 = var22; // L: 9758 + var22 = var13; // L: 9759 + } + + ++var21; // L: 9761 + ++var22; // L: 9762 + var15 = var19 > var2 ? var19 : var2; // L: 9763 + var16 = var20 > var3 ? var20 : var3; // L: 9764 + var17 = var21 < var4 ? var21 : var4; // L: 9765 + var18 = var22 < var5 ? var22 : var5; // L: 9766 + } else { + var19 = var12 + var10.width; // L: 9769 + var20 = var13 + var10.height; // L: 9770 + var15 = var12 > var2 ? var12 : var2; // L: 9771 + var16 = var13 > var3 ? var13 : var3; // L: 9772 + var17 = var19 < var4 ? var19 : var4; // L: 9773 + var18 = var20 < var5 ? var20 : var5; // L: 9774 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9776 + if (var10.contentType != 0) { // L: 9777 + if (var10.contentType == 1336) { // L: 9778 + if (Client.displayFps) { // L: 9779 + var13 += 15; // L: 9780 + class6.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9781 + var13 += 15; // L: 9782 + Runtime var42 = Runtime.getRuntime(); // L: 9783 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9784 + var21 = 16776960; // L: 9785 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9786 + var21 = 16711680; + } + + class6.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9787 + var13 += 15; // L: 9788 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9792 + Client.viewportX = var12; // L: 9793 + Client.viewportY = var13; // L: 9794 + Projectile.drawEntities(var12, var13, var10.width, var10.height); // L: 9795 + Client.field594[var10.rootIndex] = true; // L: 9796 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9797 + continue; // L: 9798 + } + + if (var10.contentType == 1338) { // L: 9800 + WallDecoration.drawMinimap(var10, var12, var13, var11); // L: 9801 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9802 + continue; // L: 9803 + } + + if (var10.contentType == 1339) { // L: 9805 + GameObject.drawCompass(var10, var12, var13, var11); // L: 9806 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9807 + continue; // L: 9808 + } + + if (var10.contentType == 1400) { // L: 9810 + class133.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9811 + } + + if (var10.contentType == 1401) { // L: 9813 + class133.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9814 + } + + if (var10.contentType == 1402) { // L: 9816 + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9817 + } + } + + if (var10.type == 0) { // L: 9820 + if (!var10.isIf3 && Varcs.isComponentHidden(var10) && var10 != WorldMapData_0.mousedOverWidgetIf1) { // L: 9821 + continue; + } + + if (!var10.isIf3) { // L: 9822 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9823 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9824 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9826 + if (var10.children != null) { // L: 9827 + 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: 9828 + if (var30 != null) { // L: 9829 + HorizontalAlignment.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9830 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9832 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9833 + } + + if (Client.isResizable || Client.field651[var11] || Client.gameDrawingMode > 1) { // L: 9835 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9836 9837 + class92.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9839 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9842 + var19 = 0; // L: 9843 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9844 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9845 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9846 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 9847 + if (var19 < 20) { // L: 9848 + var22 += var10.inventoryXOffsets[var19]; // L: 9849 + var23 += var10.inventoryYOffsets[var19]; // L: 9850 + } + + if (var10.itemIds[var19] <= 0) { // L: 9852 + if (var10.inventorySprites != null && var19 < 20) { // L: 9897 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9898 + if (var46 != null) { // L: 9899 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3049) { // L: 9900 + class184.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9853 + boolean var38 = false; // L: 9854 + var26 = var10.itemIds[var19] - 1; // L: 9855 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class247.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9856 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == ReflectionCheck.selectedItemSlot && var10.id == MouseHandler.selectedItemWidget) { // L: 9858 + var35 = class117.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = class117.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9859 + } + + if (var35 != null) { // L: 9860 + if (var10 == class247.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9861 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9862 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9863 + if (var24 < 5 && var24 > -5) { // L: 9864 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9865 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9866 + var24 = 0; // L: 9867 + var25 = 0; // L: 9868 + } + + var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9870 + if (var1 != -1) { // L: 9871 + Widget var28 = var0[var1 & 65535]; // L: 9872 + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9873 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field531 / 3; // L: 9874 + if (var29 > Client.field531 * 10) { // L: 9875 + var29 = Client.field531 * 10; + } + + if (var29 > var28.scrollY) { // L: 9876 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9877 + Client.draggedWidgetY += var29; // L: 9878 + class184.invalidateWidget(var28); // L: 9879 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9881 + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field531 / 3; // L: 9882 + if (var29 > Client.field531 * 10) { // L: 9883 + var29 = Client.field531 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9884 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9885 + Client.draggedWidgetY -= var29; // L: 9886 + class184.invalidateWidget(var28); // L: 9887 + } + } + } else if (var10 == WorldMapSection2.field2037 && var19 == Client.field577) { // L: 9891 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9892 + } + } else { + class184.invalidateWidget(var10); // L: 9894 + } + } + } + + ++var19; // L: 9902 + } + } + } else if (var10.type == 3) { // L: 9907 + if (class128.runCs1(var10)) { // L: 9909 + var19 = var10.color2; // L: 9910 + if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9911 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9914 + if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9915 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9917 + switch(var10.fillMode.field4379) { // L: 9918 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9920 + break; // L: 9921 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9923 + break; // L: 9924 + default: + if (var14 == 0) { // L: 9926 + 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: 9927 + } + } + } else if (var14 == 0) { // L: 9932 + 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: 9933 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9937 + var39 = var10.getFont(); // L: 9938 + if (var39 == null) { // L: 9939 + if (Widget.field3049) { // L: 9940 + class184.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9944 + if (class128.runCs1(var10)) { // L: 9945 + var20 = var10.color2; // L: 9946 + if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9947 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9948 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9951 + if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9952 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9954 + ItemComposition var45 = TaskHandler.ItemDefinition_get(var10.itemId); // L: 9955 + var44 = var45.name; // L: 9956 + if (var44 == null) { // L: 9957 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9958 + var44 = MouseHandler.colorStartTag(16748608) + var44 + "" + " " + 'x' + Tiles.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9960 + var44 = "Please wait..."; // L: 9961 + var20 = var10.color; // L: 9962 + } + + if (!var10.isIf3) { // L: 9964 + var44 = GrandExchangeEvent.method5449(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9965 + } + } else if (var10.type == 5) { // L: 9968 + SpritePixels var40; + if (!var10.isIf3) { // L: 9969 + var40 = var10.getSprite(class128.runCs1(var10)); // L: 9970 + if (var40 != null) { // L: 9971 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3049) { // L: 9972 + class184.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9976 + var40 = class117.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 9977 + } + + if (var40 == null) { // L: 9978 + if (Widget.field3049) { // L: 10002 + class184.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9979 + var21 = var40.height; // L: 9980 + if (!var10.spriteTiling) { // L: 9981 + var22 = var10.width * 4096 / var20; // L: 9995 + if (var10.spriteAngle != 0) { // L: 9996 + var40.method7445(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9997 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9998 + var40.drawTransBgAt(var12, var13); // L: 9999 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9982 + var22 = (var20 - 1 + var10.width) / var20; // L: 9983 + var23 = (var21 - 1 + var10.height) / var21; // L: 9984 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9985 + for (var25 = 0; var25 < var23; ++var25) { // L: 9986 + if (var10.spriteAngle != 0) { // L: 9987 + var40.method7445(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9988 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 9989 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9992 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 10006 + boolean var36 = class128.runCs1(var10); // L: 10007 + if (var36) { // L: 10009 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 10010 + } + + Model var41 = null; // L: 10011 + var22 = 0; // L: 10012 + if (var10.itemId != -1) { // L: 10013 + var33 = TaskHandler.ItemDefinition_get(var10.itemId); // L: 10014 + if (var33 != null) { // L: 10015 + var33 = var33.getCountObj(var10.itemQuantity); // L: 10016 + var41 = var33.getModel(1); // L: 10017 + if (var41 != null) { // L: 10018 + var41.calculateBoundsCylinder(); // L: 10019 + var22 = var41.height / 2; // L: 10020 + } else { + class184.invalidateWidget(var10); // L: 10022 + } + } + } else if (var10.modelType == 5) { // L: 10025 + if (var10.modelId == 0) { // L: 10026 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = HealthBarDefinition.localPlayer.getModel(); // L: 10027 + } + } else if (var20 == -1) { // L: 10029 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, HealthBarDefinition.localPlayer.appearance); // L: 10030 + if (var41 == null && Widget.field3049) { // L: 10031 + class184.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = MouseHandler.SequenceDefinition_get(var20); // L: 10034 + var41 = var10.getModel(var47, var10.modelFrame, var36, HealthBarDefinition.localPlayer.appearance); // L: 10035 + if (var41 == null && Widget.field3049) { // L: 10036 + class184.invalidateWidget(var10); + } + } + + Rasterizer3D.method4205(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10038 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10039 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10040 + if (var41 != null) { // L: 10041 + if (!var10.isIf3) { // L: 10042 + var41.method4539(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 10044 + if (var10.modelOrthog) { // L: 10045 + var41.method4525(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4539(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10046 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 10049 + } else { + if (var10.type == 7) { // L: 10052 + var39 = var10.getFont(); // L: 10053 + if (var39 == null) { // L: 10054 + if (Widget.field3049) { // L: 10055 + class184.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 10058 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10059 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10060 + if (var10.itemIds[var20] > 0) { // L: 10061 + var33 = TaskHandler.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10062 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10064 + var34 = MouseHandler.colorStartTag(16748608) + var33.name + ""; // L: 10065 + } else { + var34 = MouseHandler.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Tiles.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); // L: 10066 + var26 = var13 + (var10.paddingY + 12) * var21; // L: 10067 + if (var10.textXAlignment == 0) { // L: 10068 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 10069 + 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: 10070 + } + } + + ++var20; // L: 10072 + } + } + } + + if (var10.type == 8 && var10 == Skills.field3247 && Client.field621 == Client.field714) { // L: 10076 10077 + var19 = 0; // L: 10078 + var20 = 0; // L: 10079 + Font var31 = class6.fontPlain12; // L: 10080 + String var32 = var10.text; // L: 10081 + + String var43; + for (var32 = GrandExchangeEvent.method5449(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10083 10084 10096 + var24 = var32.indexOf("
"); // L: 10085 + if (var24 != -1) { // L: 10086 + var43 = var32.substring(0, var24); // L: 10087 + var32 = var32.substring(var24 + 4); // L: 10088 + } else { + var43 = var32; // L: 10091 + var32 = ""; // L: 10092 + } + + var25 = var31.stringWidth(var43); // L: 10094 + if (var25 > var19) { // L: 10095 + var19 = var25; + } + } + + var19 += 6; // L: 10098 + var20 += 7; // L: 10099 + var24 = var12 + var10.width - 5 - var19; // L: 10100 + var25 = var13 + var10.height + 5; // L: 10101 + if (var24 < var12 + 5) { // L: 10102 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 10103 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 10104 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10105 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10106 + var32 = var10.text; // L: 10107 + var26 = var25 + var31.ascent + 2; // L: 10108 + + for (var32 = GrandExchangeEvent.method5449(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10109 10110 10121 + int var27 = var32.indexOf("
"); // L: 10111 + if (var27 != -1) { // L: 10112 + var43 = var32.substring(0, var27); // L: 10113 + var32 = var32.substring(var27 + 4); // L: 10114 + } else { + var43 = var32; // L: 10117 + var32 = ""; // L: 10118 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10120 + } + } + + if (var10.type == 9) { // L: 10125 + if (var10.field3085) { // L: 10130 + var19 = var12; // L: 10131 + var20 = var13 + var10.height; // L: 10132 + var21 = var12 + var10.width; // L: 10133 + var22 = var13; // L: 10134 + } else { + var19 = var12; // L: 10137 + var20 = var13; // L: 10138 + var21 = var12 + var10.width; // L: 10139 + var22 = var13 + var10.height; // L: 10140 + } + + if (var10.lineWid == 1) { // L: 10142 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10143 + } else { + class392.method6872(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10146 + } + } + } + } + } + } + } + } + } + } + } + + } // L: 10151 } diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index 42f53c2607..87a4e535fc 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,84 +1,81 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("jq") public class class280 { - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "2103763806" + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-16158109" ) - static char method5139(char var0) { - switch(var0) { - case ' ': - case '-': - case '_': - case ' ': - return '_'; - case '#': - case '[': - case ']': - return var0; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; - case 'Ç': - case 'ç': - return 'c'; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; - case 'Ñ': - case 'ñ': - return 'n'; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; - case 'ß': - return 'b'; - case 'ÿ': - case 'Ÿ': - return 'y'; - default: - return Character.toLowerCase(var0); + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 74 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 75 + char var7 = var0.charAt(var6 + var1); // L: 76 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 77 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 78 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 79 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 80 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 81 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 82 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 83 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 84 + var3[var6 + var4] = -121; + } else if (var7 == 710) { // L: 85 + var3[var6 + var4] = -120; + } else if (var7 == 8240) { // L: 86 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 87 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 88 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 89 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 90 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 91 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 92 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 93 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 94 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 95 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 96 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 97 + } else if (var7 == 732) { // L: 98 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 99 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 100 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 101 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 102 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 103 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 104 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 105 + } } + + return var5; // L: 107 } } diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java index c6c25b4ffd..74b84b59ef 100644 --- a/runescape-client/src/main/java/class281.java +++ b/runescape-client/src/main/java/class281.java @@ -1,72 +1,23 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("ja") public class class281 { - @ObfuscatedName("sd") - @ObfuscatedGetter( - intValue = -1543804789 - ) - static int field3324; - @ObfuscatedName("a") - static byte[][][] field3323; - static { - int var0 = 0; - int var1 = 0; - class276[] var2 = new class276[]{class276.field3288, class276.field3289}; - class276[] var3 = var2; + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class276[] var2 = new class276[]{class276.field3282, class276.field3280}; // L: 14 + class276[] var3 = var2; // L: 16 - for (int var4 = 0; var4 < var3.length; ++var4) { - class276 var5 = var3[var4]; - if (var5.field3287 > var0) { - var0 = var5.field3287; + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 + class276 var5 = var3[var4]; // L: 18 + if (var5.field3279 > var0) { // L: 20 + var0 = var5.field3279; } - if (var5.field3290 > var1) { - var1 = var5.field3290; + if (var5.field3281 > var1) { // L: 21 + var1 = var5.field3281; } } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "-97" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } + } // L: 25 } diff --git a/runescape-client/src/main/java/class283.java b/runescape-client/src/main/java/class283.java index bc935936b8..7e6b24a7b4 100644 --- a/runescape-client/src/main/java/class283.java +++ b/runescape-client/src/main/java/class283.java @@ -3,55 +3,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("ju") public enum class283 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lju;" ) - field3649(-1), - @ObfuscatedName("q") + field3638(-1), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lju;" ) - field3646(0), - @ObfuscatedName("f") + field3640(0), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lju;" ) - field3647(1), + field3639(1), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lju;" + ) + field3637(2); + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lko;" ) - field3648(2); - - @ObfuscatedName("m") + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1834380199 + intValue = 534862973 ) - final int field3650; + final int field3636; class283(int var3) { - this.field3650 = var3; - } + this.field3636 = var3; // L: 19 + } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3650; + return this.field3636; // L: 23 } - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-476402365" + descriptor = "(I)[Low;", + garbageValue = "113976049" ) - public static int method5141(int var0) { - return class361.field4054[var0 & 16383]; + static SpritePixels[] method5221() { + SpritePixels[] var0 = new SpritePixels[class414.SpriteBuffer_spriteCount]; // L: 173 + + for (int var1 = 0; var1 < class414.SpriteBuffer_spriteCount; ++var1) { // L: 174 + SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 175 + var2.width = class414.SpriteBuffer_spriteWidth; // L: 176 + var2.height = class414.SpriteBuffer_spriteHeight; // L: 177 + var2.xOffset = class414.SpriteBuffer_xOffsets[var1]; // L: 178 + var2.yOffset = class414.SpriteBuffer_yOffsets[var1]; // L: 179 + var2.subWidth = UrlRequester.SpriteBuffer_spriteWidths[var1]; // L: 180 + var2.subHeight = class414.SpriteBuffer_spriteHeights[var1]; // L: 181 + int var3 = var2.subHeight * var2.subWidth; // L: 182 + byte[] var4 = class295.SpriteBuffer_pixels[var1]; // L: 183 + var2.pixels = new int[var3]; // L: 184 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 185 + var2.pixels[var5] = HitSplatDefinition.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + PacketBuffer.method6913(); // L: 187 + return var0; // L: 188 } } diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index 73ceb46fd8..e5788c9e6a 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -2,46 +2,73 @@ import java.applet.Applet; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("al") public class class29 { - @ObfuscatedName("l") - static Applet field168; - @ObfuscatedName("q") - static String field165; - @ObfuscatedName("bg") + @ObfuscatedName("rp") + static boolean field162; + @ObfuscatedName("i") + static Applet field157; + @ObfuscatedName("w") + static String field158; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Loe;" ) - static GameBuild field171; + static IndexedSprite field159; static { - field168 = null; - field165 = ""; + field157 = null; // L: 10 + field158 = ""; // L: 11 } - @ObfuscatedName("ju") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1657881975" + descriptor = "(I)V", + garbageValue = "-2136894012" ) - static final void method430(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != WorldMapDecorationType.clientPreferences.musicVolume) { - if (WorldMapDecorationType.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { - class67.method1886(Tiles.archive6, Client.currentTrackGroupId, 0, var0, false); - Client.field663 = false; - } else if (var0 == 0) { - class247.midiPcmStream.clear(); - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = null; - Client.field663 = false; - } else { - class4.method19(var0); - } + static final void method414() { + boolean var0 = false; // L: 9261 - WorldMapDecorationType.clientPreferences.musicVolume = var0; - ScriptFrame.savePreferences(); + while (!var0) { // L: 9262 + var0 = true; // L: 9263 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9264 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9265 + String var2 = Client.menuTargets[var1]; // L: 9266 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9267 + Client.menuTargets[var1 + 1] = var2; // L: 9268 + String var3 = Client.menuActions[var1]; // L: 9269 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9270 + Client.menuActions[var1 + 1] = var3; // L: 9271 + int var4 = Client.menuOpcodes[var1]; // L: 9272 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9273 + Client.menuOpcodes[var1 + 1] = var4; // L: 9274 + var4 = Client.menuArguments1[var1]; // L: 9275 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9276 + Client.menuArguments1[var1 + 1] = var4; // L: 9277 + var4 = Client.menuArguments2[var1]; // L: 9278 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9279 + Client.menuArguments2[var1 + 1] = var4; // L: 9280 + var4 = Client.menuIdentifiers[var1]; // L: 9281 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9282 + Client.menuIdentifiers[var1 + 1] = var4; // L: 9283 + boolean var5 = Client.menuShiftClick[var1]; // L: 9284 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9285 + Client.menuShiftClick[var1 + 1] = var5; // L: 9286 + var0 = false; // L: 9287 + } + } } - } + } // L: 9291 + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1998570042" + ) + static void method413() { + Client.packetWriter.addNode(AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2742, Client.packetWriter.isaacCipher)); // L: 12016 + Client.oculusOrbState = 0; // L: 12017 + } // L: 12018 } diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java index ab530a9892..03fd4c9bf2 100644 --- a/runescape-client/src/main/java/class295.java +++ b/runescape-client/src/main/java/class295.java @@ -1,29 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kb") public class class295 { - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1052203633" + @ObfuscatedName("j") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 2057880945 ) - static void method5382(String var0) { - ItemContainer.field1009 = var0; - - try { - String var1 = class21.client.getParameter(Integer.toString(18)); - String var2 = class21.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=" + UserComparator3.method2438(UserComparator4.method2406() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - class27.method405(class21.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { - } - - } + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index b4dd08985f..f725669eb3 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("a") public interface class3 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;)Lot;" + descriptor = "(Lop;)Lop;" ) - Buffer vmethod15(Buffer var1); + Buffer vmethod18(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 84b9c99ac1..a25f03a6b5 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,45 +1,52 @@ +import java.io.File; +import java.io.IOException; import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kv") public class class300 { - @ObfuscatedName("l") + @ObfuscatedName("j") + static int[] field3765; + @ObfuscatedName("h") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("i") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("f") - int[] field3774; - @ObfuscatedName("j") - int[] field3775; - @ObfuscatedName("m") + @ObfuscatedName("s") + int[] field3761; + @ObfuscatedName("a") + int[] field3760; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1668663383 + intValue = -204507217 ) - int field3776; + int field3762; public class300() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3774 = new int[2048]; - this.field3775 = new int[2048]; - this.field3776 = 0; - class268.method5104(); - } + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3761 = new int[2048]; // L: 12 + this.field3760 = new int[2048]; // L: 13 + this.field3762 = 0; // L: 14 + UserComparator6.method2513(); // L: 21 + } // L: 22 - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2023948868" + garbageValue = "1928494539" ) - void method5453(int var1) { + void method5487(int var1) { int var2 = var1 * 2 + 1; double var4 = (double)((float)var1 / 3.0F); int var6 = var1 * 2 + 1; @@ -47,123 +54,122 @@ public class class300 { int var8 = -var1; for (int var9 = 0; var8 <= var1; ++var9) { - double var20 = WorldMapData_0.method3438((double)(var8 - 0) / var4) / var4; - var7[var9] = var20; - ++var8; + var7[var9] = PacketWriter.method2425((double)var8, 0.0D, var4); + ++var8; // L: 52 } - double[] var14 = var7; - double var15 = var7[var1] * var7[var1]; + double[] var14 = var7; // L: 57 + double var15 = var7[var1] * var7[var1]; // L: 58 int[] var17 = new int[var2 * var2]; - boolean var10 = false; + boolean var10 = false; // L: 60 for (int var11 = 0; var11 < var2; ++var11) { - for (int var12 = 0; var12 < var2; ++var12) { - int var13 = var17[var12 + var2 * var11] = (int)(var14[var11] * var14[var12] / var15 * 256.0D); + for (int var12 = 0; var12 < var2; ++var12) { // L: 62 + int var13 = var17[var12 + var2 * var11] = (int)(var14[var12] * var14[var11] / var15 * 256.0D); if (!var10 && var13 > 0) { var10 = true; } } } - SpritePixels var18 = new SpritePixels(var17, var2, var2); + SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 this.spriteMap.put(var1, var18); } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lon;", - garbageValue = "-948726242" + descriptor = "(II)Low;", + garbageValue = "-975153988" ) - SpritePixels method5432(int var1) { + SpritePixels method5488(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method5453(var1); + this.method5487(var1); } - return (SpritePixels)this.spriteMap.get(var1); + return (SpritePixels)this.spriteMap.get(var1); // L: 77 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "733249359" + garbageValue = "262729" ) - public final void method5433(int var1, int var2) { - if (this.field3776 < this.field3774.length) { - this.field3774[this.field3776] = var1; - this.field3775[this.field3776] = var2; - ++this.field3776; + public final void method5498(int var1, int var2) { + if (this.field3762 < this.field3761.length) { + this.field3761[this.field3762] = var1; + this.field3760[this.field3762] = var2; + ++this.field3762; // L: 84 } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2111491523" + garbageValue = "-1224368993" ) - public final void method5434() { - this.field3776 = 0; + public final void method5490() { + this.field3762 = 0; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IILon;FI)V", - garbageValue = "-1572893124" + descriptor = "(IILow;FB)V", + garbageValue = "-58" ) - public final void method5456(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(var4 * 18.0F); - SpritePixels var6 = this.method5432(var5); - int var7 = var5 * 2 + 1; + public final void method5491(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); + SpritePixels var6 = this.method5488(var5); // L: 93 + int var7 = var5 * 2 + 1; // L: 94 Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); + this.bounds.setHigh(var7, var7); // L: 97 System.nanoTime(); int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3776; ++var10) { - var11 = this.field3774[var10]; - var12 = this.field3775[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; + for (var10 = 0; var10 < this.field3762; ++var10) { // L: 99 + var11 = this.field3761[var10]; + var12 = this.field3760[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 102 + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; this.bounds.setLow(var13, var14); - this.bounds.method6253(var8, var9); - this.method5437(var6, var3, var9); + this.bounds.method6353(var8, var9); + this.method5494(var6, var3, var9); } - System.nanoTime(); + System.nanoTime(); // L: 108 System.nanoTime(); 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; + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if (var11 > KeyHandler.field145.length) { - var11 = KeyHandler.field145.length; + if (var11 > field3765.length) { + var11 = field3765.length; } - var12 = KeyHandler.field145[var11 - 1]; + var12 = field3765[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } } System.nanoTime(); - } + } // L: 125 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lon;Lon;Lme;B)V", - garbageValue = "113" + descriptor = "(Low;Low;Lmo;B)V", + garbageValue = "-61" ) - void method5437(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; + void method5494(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 128 + int var4 = 0; // L: 129 int var5 = 0; if (var3.lowX == 0) { var4 = var1.subWidth - var3.highX; @@ -173,65 +179,211 @@ public class class300 { var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; - int var7 = var3.lowX + var2.subWidth * var3.lowY; + int var6 = var4 + var5 * var1.subWidth; // L: 133 + int var7 = var2.subWidth * var3.lowY + var3.lowX; for (int var8 = 0; var8 < var3.highY; ++var8) { for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; + int[] var10000 = var2.pixels; // L: 137 int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; + var6 += var1.subWidth - var3.highX; // L: 139 var7 += var2.subWidth - var3.highX; } } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIILfo;IB)V", - garbageValue = "12" + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-2012491010" ) - static void method5457(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; + public static void method5507(String var0, String var1, int var2, int var3) throws IOException { + ItemContainer.idxCount = var3; // L: 40 + JagexCache.cacheGamebuild = var2; // L: 41 + + try { + JagexCache.operatingSystemName = System.getProperty("os.name"); // L: 43 + } catch (Exception var27) { // L: 45 + JagexCache.operatingSystemName = "Unknown"; // L: 46 } - var5.field807 = (var6 + var1) * 128; - var5.field803 = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field804 = var3.int7 * 128; - var5.field808 = var3.int5; - var5.field809 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); + class176.formattedOperatingSystemName = JagexCache.operatingSystemName.toLowerCase(); // L: 48 + + try { + TriBool.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (TriBool.userHomeDirectory != null) { // L: 51 + TriBool.userHomeDirectory = TriBool.userHomeDirectory + "/"; + } + } catch (Exception var26) { // L: 53 } - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field811 = var5.field808 + (int)(Math.random() * (double)(var5.field809 - var5.field808)); + try { + if (class176.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (TriBool.userHomeDirectory == null) { // L: 56 + TriBool.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (TriBool.userHomeDirectory == null) { // L: 59 + TriBool.userHomeDirectory = System.getenv("HOME"); + } + + if (TriBool.userHomeDirectory != null) { // L: 61 + TriBool.userHomeDirectory = TriBool.userHomeDirectory + "/"; + } + } catch (Exception var25) { // L: 63 } - } + if (TriBool.userHomeDirectory == null) { // L: 64 + TriBool.userHomeDirectory = "~/"; + } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-896124" - ) - static int method5458(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field826 - 7.0D) * 256.0D); - } + NPC.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", TriBool.userHomeDirectory, "/tmp/", ""}; // L: 65 + AbstractRasterProvider.cacheSubPaths = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; // L: 66 + int var18 = 0; + + label232: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + class351.JagexCache_locationFile = new File(TriBool.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 + String var7 = null; // L: 72 + String var8 = null; // L: 73 + boolean var9 = false; // L: 74 + File var32; + if (class351.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(class351.JagexCache_locationFile, "rw", 10000L); // L: 78 + + Buffer var11; + int var12; + for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 + var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 + if (var12 == -1) { // L: 82 + throw new IOException(); + } + } + + var11.offset = 0; // L: 85 + var12 = var11.readUnsignedByte(); // L: 86 + if (var12 < 1 || var12 > 3) { // L: 87 + throw new IOException("" + var12); + } + + int var13 = 0; // L: 88 + if (var12 > 1) { // L: 89 + var13 = var11.readUnsignedByte(); + } + + if (var12 <= 2) { // L: 90 + var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 + if (var13 == 1) { // L: 92 + var8 = var11.readStringCp1252NullCircumfixed(); + } + } else { + var7 = var11.readCESU8(); // L: 95 + if (var13 == 1) { // L: 96 + var8 = var11.readCESU8(); + } + } + + var10.close(); // L: 98 + } catch (IOException var29) { // L: 100 + var29.printStackTrace(); // L: 101 + } + + if (var7 != null) { // L: 103 + var32 = new File(var7); // L: 104 + if (!var32.exists()) { // L: 105 + var7 = null; // L: 106 + } + } + + if (var7 != null) { // L: 109 + var32 = new File(var7, "test.dat"); // L: 110 + if (!Varcs.method2359(var32, true)) { // L: 111 + var7 = null; // L: 112 + } + } + } + + if (var7 == null && var18 == 0) { // L: 116 + label207: + for (int var19 = 0; var19 < AbstractRasterProvider.cacheSubPaths.length; ++var19) { // L: 117 + for (int var20 = 0; var20 < NPC.cacheParentPaths.length; ++var20) { // L: 118 + File var21 = new File(NPC.cacheParentPaths[var20] + AbstractRasterProvider.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 + if (var21.exists() && Varcs.method2359(new File(var21, "test.dat"), true)) { // L: 120 121 + var7 = var21.toString(); // L: 122 + var9 = true; // L: 123 + break label207; // L: 124 + } + } + } + } + + if (var7 == null) { // L: 130 + var7 = TriBool.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131 + var9 = true; // L: 132 + } + + if (var8 != null) { // L: 134 + File var31 = new File(var8); // L: 135 + var32 = new File(var7); // L: 136 + + try { + File[] var34 = var31.listFiles(); // L: 138 + File[] var22 = var34; // L: 140 + + for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 + File var15 = var22[var14]; // L: 142 + File var16 = new File(var32, var15.getName()); // L: 144 + boolean var17 = var15.renameTo(var16); // L: 145 + if (!var17) { // L: 146 + throw new IOException(); + } + } + } catch (Exception var28) { // L: 151 + var28.printStackTrace(); // L: 152 + } + + var9 = true; // L: 154 + } + + if (var9) { // L: 156 + UserComparator7.method2470(new File(var7), (File)null); + } + + File var5 = new File(var7); // L: 157 + JagexCache.cacheDir = var5; // L: 159 + if (!JagexCache.cacheDir.exists()) { // L: 160 + JagexCache.cacheDir.mkdirs(); + } + + File[] var30 = JagexCache.cacheDir.listFiles(); // L: 161 + if (var30 != null) { // L: 162 + File[] var33 = var30; // L: 164 + + for (int var23 = 0; var23 < var33.length; ++var23) { // L: 165 + File var24 = var33[var23]; // L: 166 + if (!Varcs.method2359(var24, false)) { // L: 168 + ++var18; // L: 67 + continue label232; + } + } + } + break; + } + + UserComparator6.method2508(JagexCache.cacheDir); // L: 175 + WorldMapData_1.method3844(); // L: 176 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 177 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 178 + WorldMapID.JagexCache_idxFiles = new BufferedFile[ItemContainer.idxCount]; // L: 179 + + for (var18 = 0; var18 < ItemContainer.idxCount; ++var18) { // L: 180 + WorldMapID.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 181 + } + + } // L: 183 } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java index 716e6bfb85..0a7fd86935 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class301.java @@ -1,41 +1,43 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kq") public class class301 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkq;" ) - static final class301 field3780; - @ObfuscatedName("q") + static final class301 field3767; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkq;" ) - static final class301 field3782; - @ObfuscatedName("f") + static final class301 field3770; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkq;" ) - static final class301 field3781; + static final class301 field3769; static { - field3780 = new class301(); - field3782 = new class301(); - field3781 = new class301(); + field3767 = new class301(); // L: 4 + field3770 = new class301(); // L: 5 + field3769 = new class301(); // L: 6 } class301() { - } + } // L: 8 - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)Lbo;", - garbageValue = "-230325466" + descriptor = "(I)V", + garbageValue = "-1299258099" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } + static void method5508() { + ByteArrayPool.field3890.clear(); // L: 61 + ByteArrayPool.field3890.add(100); // L: 62 + ByteArrayPool.field3890.add(5000); // L: 63 + ByteArrayPool.field3890.add(10000); // L: 64 + ByteArrayPool.field3890.add(30000); // L: 65 + } // L: 66 } diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index 8c27d2ee05..273ad405db 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,9 +1,9 @@ import java.util.HashMap; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kv") +@ObfuscatedName("ke") public class class303 { static { new HashMap(); - } + } // L: 9 } diff --git a/runescape-client/src/main/java/class316.java b/runescape-client/src/main/java/class316.java index 1cd608862d..1437c4af22 100644 --- a/runescape-client/src/main/java/class316.java +++ b/runescape-client/src/main/java/class316.java @@ -1,13 +1,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lf") public class class316 { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2019378433" + ) + static void method5839(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11871 + if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11872 + var1.remove(); // L: 11873 + } + } + + } // L: 11876 } diff --git a/runescape-client/src/main/java/class317.java b/runescape-client/src/main/java/class317.java index 541fdb2214..fabbf49475 100644 --- a/runescape-client/src/main/java/class317.java +++ b/runescape-client/src/main/java/class317.java @@ -1,99 +1,199 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("ly") public class class317 { - @ObfuscatedName("l") - static char[] field3869; - @ObfuscatedName("q") - static char[] field3865; - @ObfuscatedName("f") - static char[] field3866; - @ObfuscatedName("j") - static int[] field3867; + @ObfuscatedName("i") + static char[] field3854; + @ObfuscatedName("w") + static char[] field3852; + @ObfuscatedName("s") + static char[] field3851; + @ObfuscatedName("a") + static int[] field3853; static { - field3869 = new char[64]; + field3854 = new char[64]; // L: 7 int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field3854[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field3854[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field3854[var0] = (char)(var0 + 48 - 52); + } + + field3854[62] = '+'; // L: 11 + field3854[63] = '/'; // L: 12 + field3852 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field3852[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field3852[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field3852[var0] = (char)(var0 + 48 - 52); + } + + field3852[62] = '*'; // L: 22 + field3852[63] = '-'; // L: 23 + field3851 = new char[64]; // L: 29 + for (var0 = 0; var0 < 26; ++var0) { - field3869[var0] = (char)(var0 + 65); + field3851[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3869[var0] = (char)(var0 + 97 - 26); + field3851[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { - field3869[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field3851[var0] = (char)(var0 + 48 - 52); } - field3869[62] = '+'; - field3869[63] = '/'; - field3865 = new char[64]; + field3851[62] = '-'; // L: 33 + field3851[63] = '_'; // L: 34 + field3853 = new int[128]; // L: 40 - for (var0 = 0; var0 < 26; ++var0) { - field3865[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < field3853.length; ++var0) { // L: 41 + field3853[var0] = -1; } - for (var0 = 26; var0 < 52; ++var0) { - field3865[var0] = (char)(var0 + 97 - 26); + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field3853[var0] = var0 - 65; } - for (var0 = 52; var0 < 62; ++var0) { - field3865[var0] = (char)(var0 + 48 - 52); + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field3853[var0] = var0 - 97 + 26; } - field3865[62] = '*'; - field3865[63] = '-'; - field3866 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3866[var0] = (char)(var0 + 65); + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field3853[var0] = var0 - 48 + 52; } - for (var0 = 26; var0 < 52; ++var0) { - field3866[var0] = (char)(var0 + 97 - 26); + int[] var2 = field3853; // L: 45 + field3853[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field3853; // L: 48 + field3853[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1157640581" + ) + public static int method5852(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 + if ((var1 & 1) != 0) { + var2 = var0 * var2; // L: 26 + } + + var0 *= var0; // L: 27 } - for (var0 = 52; var0 < 62; ++var0) { - field3866[var0] = (char)(var0 + 48 - 52); + if (var1 == 1) { // L: 30 + return var0 * var2; + } else { + return var2; // L: 31 } - - field3866[62] = '-'; - field3866[63] = '_'; - field3867 = new int[128]; - - for (var0 = 0; var0 < field3867.length; ++var0) { - field3867[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3867[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3867[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3867[var0] = var0 - 48 + 52; - } - - int[] var2 = field3867; - field3867[43] = 62; - var2[42] = 62; - int[] var1 = field3867; - field3867[47] = 63; - var1[45] = 63; } - @ObfuscatedName("gm") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1006601644" + descriptor = "(CLkz;I)C", + garbageValue = "-307782821" ) - static boolean method5800() { - return (Client.drawPlayerNames & 8) != 0; + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 69 + if (var0 >= 192 && var0 <= 198) { // L: 70 + return 'A'; + } + + if (var0 == 199) { // L: 71 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 72 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 73 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 74 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 75 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 76 + return 'U'; + } + + if (var0 == 221) { // L: 77 + return 'Y'; + } + + if (var0 == 223) { // L: 78 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 79 + return 'a'; + } + + if (var0 == 231) { // L: 80 + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { // L: 81 + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { // L: 82 + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 83 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 84 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 85 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 86 + return 'y'; + } + } + + if (var0 == 338) { // L: 88 + return 'O'; + } else if (var0 == 339) { // L: 89 + return 'o'; + } else { + return var0 == 376 ? 'Y' : var0; // L: 90 + } } } diff --git a/runescape-client/src/main/java/class318.java b/runescape-client/src/main/java/class318.java index 6f445c1216..13d9da54b6 100644 --- a/runescape-client/src/main/java/class318.java +++ b/runescape-client/src/main/java/class318.java @@ -1,169 +1,243 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lq") public final class class318 { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 323329615 - ) - public static int field3870; - - @ObfuscatedName("hb") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Loy;I)V", - garbageValue = "-741339264" + descriptor = "(ILmr;Lkd;I)V", + garbageValue = "-2060859184" ) - static final void method5839(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field713; ++var1) { - int var2 = Client.field535[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 16) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; - } - - int var5; - if ((var4 & 2) != 0) { - var3.spotAnimation = var0.method7059(); - var5 = var0.method6944(); - var3.field1147 = var5 >> 16; - var3.field1105 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field1105 > Client.cycle) { - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } - } - - int var6; - int var7; - if ((var4 & 4) != 0) { - var5 = var0.method6934(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method6925(); - if (var5 == var3.sequence && var5 != -1) { - var7 = KitDefinition.SequenceDefinition_get(var5).field1961; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1142 = 0; - } - - if (var7 == 2) { - var3.field1142 = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || KitDefinition.SequenceDefinition_get(var5).field1955 >= KitDefinition.SequenceDefinition_get(var3.sequence).field1955) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1142 = 0; - var3.field1129 = var3.pathLength; - } - } - - int var8; - if ((var4 & 128) != 0) { - var5 = var0.readUnsignedByte(); - int var9; - int var10; - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.readUnsignedByte(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.readUnsignedByte(); - int var12 = var9 > 0 ? var0.method6926() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var3.removeHealthBar(var8); - } - } - } - } - - if ((var4 & 8) != 0) { - var3.definition = class112.getNpcDefinition(var0.method7059()); - var3.field1109 = var3.definition.size; - var3.field1146 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.idleSequence = var3.definition.idleSequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } - - if ((var4 & 1) != 0) { - var5 = var0.method7059(); - var6 = var0.method6933(); - var7 = var3.x - (var5 - WorldMapSectionType.baseX - WorldMapSectionType.baseX) * 64; - var8 = var3.y - (var6 - PlayerComposition.baseY - PlayerComposition.baseY) * 64; - if (var7 != 0 || var8 != 0) { - var3.field1134 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 32) != 0) { - var3.field1148 = var0.method6915(); - var3.field1126 = var0.method6915(); - var3.field1149 = var0.method6958(); - var3.field1125 = var0.method6958(); - var3.field1145 = var0.method6934() + Client.cycle; - var3.field1165 = var0.method6933() + Client.cycle; - var3.field1151 = var0.method7059(); - var3.pathLength = 1; - var3.field1129 = 0; - var3.field1148 += var3.pathX[0]; - var3.field1126 += var3.pathY[0]; - var3.field1149 += var3.pathX[0]; - var3.field1125 += var3.pathY[0]; - } - - if ((var4 & 64) != 0) { - var3.targetIndex = var0.method6934(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; + static void method5887(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 } } } + if (var3 != null) { // L: 39 + var2.load(var1, var0, var3, true); // L: 40 + } else { + byte[] var4 = var1.read(var0); // L: 43 + var2.load(var1, var0, var4, true); // L: 44 + } + } // L: 41 45 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIILfc;Lfq;S)Z", + garbageValue = "14344" + ) + public static final boolean method5874(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 + class174.directions[var7][var8] = 99; // L: 143 + class174.distances[var7][var8] = 0; // L: 144 + byte var11 = 0; // L: 145 + int var12 = 0; // L: 146 + class174.bufferX[var11] = var0; // L: 147 + int var20 = var11 + 1; + class174.bufferY[var11] = var1; // L: 148 + int[][] var13 = var4.flags; // L: 149 + + while (true) { + label303: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label280: + do { + if (var20 == var12) { // L: 150 + RouteStrategy.field1979 = var5; // L: 269 + class67.field845 = var6; // L: 270 + return false; // L: 271 + } + + var5 = class174.bufferX[var12]; // L: 151 + var6 = class174.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 + RouteStrategy.field1979 = var5; // L: 159 + class67.field845 = var6; // L: 160 + return true; // L: 161 + } + + var16 = class174.distances[var18][var19] + 1; // L: 163 + if (var18 > 0 && class174.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 164 165 166 167 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5 - 1; // L: 171 + class174.bufferY[var20] = var6; // L: 172 + var20 = var20 + 1 & 4095; // L: 173 + class174.directions[var18 - 1][var19] = 2; // L: 174 + class174.distances[var18 - 1][var19] = var16; // L: 175 + break; + } + + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 169 + break; + } + + ++var17; // L: 168 + } + } + + if (var18 < 128 - var2 && class174.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 177 178 179 180 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5 + 1; // L: 184 + class174.bufferY[var20] = var6; // L: 185 + var20 = var20 + 1 & 4095; // L: 186 + class174.directions[var18 + 1][var19] = 8; // L: 187 + class174.distances[var18 + 1][var19] = var16; // L: 188 + break; + } + + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 182 + break; + } + + ++var17; // L: 181 + } + } + + if (var19 > 0 && class174.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 190 191 192 193 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5; // L: 197 + class174.bufferY[var20] = var6 - 1; // L: 198 + var20 = var20 + 1 & 4095; // L: 199 + class174.directions[var18][var19 - 1] = 1; // L: 200 + class174.distances[var18][var19 - 1] = var16; // L: 201 + break; + } + + if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 195 + break; + } + + ++var17; // L: 194 + } + } + + if (var19 < 128 - var2 && class174.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 203 204 205 206 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5; // L: 210 + class174.bufferY[var20] = var6 + 1; // L: 211 + var20 = var20 + 1 & 4095; // L: 212 + class174.directions[var18][var19 + 1] = 4; // L: 213 + class174.distances[var18][var19 + 1] = var16; // L: 214 + break; + } + + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 208 + break; + } + + ++var17; // L: 207 + } + } + + if (var18 > 0 && var19 > 0 && class174.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 216 217 218 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class174.bufferX[var20] = var5 - 1; // L: 223 + class174.bufferY[var20] = var6 - 1; // L: 224 + var20 = var20 + 1 & 4095; // L: 225 + class174.directions[var18 - 1][var19 - 1] = 3; // L: 226 + class174.distances[var18 - 1][var19 - 1] = var16; // L: 227 + break; + } + + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 220 221 + break; + } + + ++var17; // L: 219 + } + } + + if (var18 < 128 - var2 && var19 > 0 && class174.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 229 230 231 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class174.bufferX[var20] = var5 + 1; // L: 236 + class174.bufferY[var20] = var6 - 1; // L: 237 + var20 = var20 + 1 & 4095; // L: 238 + class174.directions[var18 + 1][var19 - 1] = 9; // L: 239 + class174.distances[var18 + 1][var19 - 1] = var16; // L: 240 + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 233 234 + break; + } + + ++var17; // L: 232 + } + } + + if (var18 > 0 && var19 < 128 - var2 && class174.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 + continue label280; + } + } + + class174.bufferX[var20] = var5 - 1; // L: 249 + class174.bufferY[var20] = var6 + 1; // L: 250 + var20 = var20 + 1 & 4095; // L: 251 + class174.directions[var18 - 1][var19 + 1] = 6; // L: 252 + class174.distances[var18 - 1][var19 + 1] = var16; // L: 253 + } + } while(var18 >= 128 - var2); // L: 255 + } while(var19 >= 128 - var2); + } while(class174.directions[var18 + 1][var19 + 1] != 0); // L: 256 + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 257 + + for (var17 = 1; var17 < var2; ++var17) { // L: 258 + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 259 260 + continue label303; + } + } + + class174.bufferX[var20] = var5 + 1; // L: 262 + class174.bufferY[var20] = var6 + 1; // L: 263 + var20 = var20 + 1 & 4095; // L: 264 + class174.directions[var18 + 1][var19 + 1] = 12; // L: 265 + class174.distances[var18 + 1][var19 + 1] = var16; // L: 266 + } + } } } diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java new file mode 100644 index 0000000000..a0c0e1aebb --- /dev/null +++ b/runescape-client/src/main/java/class319.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ll") +public class class319 { + @ObfuscatedName("cp") + public static char field3858; +} diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java index c37785d618..ccc8524ea2 100644 --- a/runescape-client/src/main/java/class320.java +++ b/runescape-client/src/main/java/class320.java @@ -1,28 +1,40 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lk") public final class class320 { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("base37Table") public static final char[] base37Table; - @ObfuscatedName("q") - static long[] field3875; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "[Loz;" + @ObfuscatedName("w") + static long[] field3860; + @ObfuscatedName("fy") + @ObfuscatedGetter( + intValue = -433173711 ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; + static int field3868; + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "Lcf;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("jl") + @ObfuscatedGetter( + intValue = -1325335001 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; 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'}; - field3875 = new long[12]; + 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 + field3860 = new long[12]; // L: 5 - for (int var0 = 0; var0 < field3875.length; ++var0) { - field3875[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3860.length; ++var0) { // L: 8 + field3860[var0] = (long)Math.pow(37.0D, (double)var0); } - } + } // L: 9 } diff --git a/runescape-client/src/main/java/class321.java b/runescape-client/src/main/java/class321.java index 492fbbd6f8..5d5f0a7707 100644 --- a/runescape-client/src/main/java/class321.java +++ b/runescape-client/src/main/java/class321.java @@ -1,71 +1,71 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lv") +@ObfuscatedName("li") public class class321 { - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { - if (var3 == var1) { + if (var2 == var0) { // L: 12 + if (var3 == var1) { // L: 13 return; } - if (var3 > var1 && var3 < var4 + var1) { - --var4; - var1 += var4; - var3 += var4; - var4 = var1 - var4; + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { - 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: 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--]) { + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 } - return; + return; // L: 32 } } - var4 += var1; + var4 += var1; // L: 35 - 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: 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++]) { + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 } - } + } // L: 49 - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { - 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 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 + var0[var1++] = 0; // L: 366 + var0[var1++] = 0; // L: 367 + var0[var1++] = 0; // L: 368 + var0[var1++] = 0; // L: 369 + var0[var1++] = 0; // L: 370 + var0[var1++] = 0; // L: 371 + var0[var1++] = 0; // L: 372 } - for (var2 += 7; var1 < var2; var0[var1++] = 0) { + for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 } - } + } // L: 377 } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index e378c72535..b3945e7fbf 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -1,65 +1,36 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lx") public class class322 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 65308803 + intValue = -902702553 ) - int field3878; - @ObfuscatedName("q") + int field3872; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1163920539 + intValue = -1387523435 ) - int field3879; - @ObfuscatedName("f") + int field3874; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1995398165 + intValue = 1669438009 ) - int field3880; - @ObfuscatedName("j") + int field3870; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1378321945 + intValue = 1408638013 ) - int field3881; + int field3871; public String toString() { - int var2 = 10 - Integer.toString(this.field3878).length(); - int var3 = 10 - Integer.toString(this.field3880).length(); - int var4 = 10 - Integer.toString(this.field3879).length(); - String var5 = " ".substring(10 - var2); - String var6 = " ".substring(10 - var3); - String var7 = " ".substring(10 - var4); - return " Size: " + this.field3878 + var5 + "Created: " + this.field3879 + var7 + "Total used: " + this.field3880 + var6 + "Max-In-Use: " + this.field3881; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljt;IB)V", - garbageValue = "-7" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3115 == null) { - throw new RuntimeException(); - } else { - if (var0.field3190 == null) { - var0.field3190 = new int[var0.field3115.length]; - } - - var0.field3190[var1] = Integer.MAX_VALUE; - } - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - static void method5894(int var0) { - Client.oculusOrbState = var0; + int var2 = 10 - Integer.toString(this.field3872).length(); // L: 15 + int var3 = 10 - Integer.toString(this.field3870).length(); // L: 16 + int var4 = 10 - Integer.toString(this.field3874).length(); // L: 17 + String var5 = " ".substring(10 - var2); // L: 18 + String var6 = " ".substring(10 - var3); // L: 19 + String var7 = " ".substring(10 - var4); // L: 20 + return " Size: " + this.field3872 + var5 + "Created: " + this.field3874 + var7 + "Total used: " + this.field3870 + var6 + "Max-In-Use: " + this.field3871; // L: 21 } } diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java deleted file mode 100644 index 57bad7cfdb..0000000000 --- a/runescape-client/src/main/java/class326.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lo") -public class class326 { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-764707553" - ) - public static boolean method5928(int var0) { - return var0 >= WorldMapDecorationType.field3232.id && var0 <= WorldMapDecorationType.field3246.id; - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "692474677" - ) - static void method5929() { - if (Client.renderSelf) { - class21.addPlayerToScene(class67.localPlayer, false); - } - - } -} diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java new file mode 100644 index 0000000000..9c59915985 --- /dev/null +++ b/runescape-client/src/main/java/class327.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lh") +public class class327 { + @ObfuscatedName("bw") + @ObfuscatedGetter( + intValue = 675929595 + ) + static int field3908; +} diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java deleted file mode 100644 index 1555f478a4..0000000000 --- a/runescape-client/src/main/java/class328.java +++ /dev/null @@ -1,86 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lf") -public class class328 { - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(Lcd;I)V", - garbageValue = "-1815544161" - ) - static final void method5930(Actor var0) { - if (var0.field1146 != 0) { - if (var0.targetIndex != -1) { - Object var1 = null; - if (var0.targetIndex < 32768) { - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var1 = Client.players[var0.targetIndex - 32768]; - } - - if (var1 != null) { - int var2 = var0.x - ((Actor)var1).x; - int var3 = var0.y - ((Actor)var1).y; - if (var2 != 0 || var3 != 0) { - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - if (var0.field1134 != -1 && (var0.pathLength == 0 || var0.field1164 > 0)) { - var0.orientation = var0.field1134; - var0.field1134 = -1; - } - - int var4 = var0.orientation - var0.rotation & 2047; - if (var4 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var4 != 0) { - ++var0.field1158; - boolean var6; - if (var4 > 1024) { - var0.rotation -= var0.field1146; - var6 = true; - if (var4 < var0.field1146 || var4 > 2048 - var0.field1146) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.idleSequence == var0.movementSequence && (var0.field1158 > 25 || var6)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field1146; - var6 = true; - if (var4 < var0.field1146 || var4 > 2048 - var0.field1146) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1158 > 25 || var6)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; - } else { - var0.field1158 = 0; - } - - } - } -} diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java deleted file mode 100644 index 1260f4d5fd..0000000000 --- a/runescape-client/src/main/java/class329.java +++ /dev/null @@ -1,87 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("lk") -public class class329 { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILbe;ZB)I", - garbageValue = "1" - ) - static int method5931(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { - AbstractByteArrayCopier.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - EnumComposition var10 = VarbitComposition.getEnum(var3); - if (var10.outputType != 's') { - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { - if (var9 == var10.keys[var6]) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var10.strVals[var6]; - var10 = null; - break; - } - } - - if (var10 != null) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--AbstractByteArrayCopier.Interpreter_intStackSize]; - EnumComposition var4 = VarbitComposition.getEnum(var3); - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var4.size(); - return 1; - } else { - return 2; - } - } else { - AbstractByteArrayCopier.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[AbstractByteArrayCopier.Interpreter_intStackSize + 3]; - EnumComposition var7 = VarbitComposition.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[++class54.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class54.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++AbstractByteArrayCopier.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } -} diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java index cc422511c1..c211809a21 100644 --- a/runescape-client/src/main/java/class351.java +++ b/runescape-client/src/main/java/class351.java @@ -1,51 +1,10 @@ +import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mc") public class class351 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; @ObfuscatedName("a") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lot;IB)V", - garbageValue = "-49" - ) - public static void method6285(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { - } - } - - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1301102242" - ) - static String method6286(String var0) { - PlayerType[] var1 = class19.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(ReflectionCheck.method1064(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; - } + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; } diff --git a/runescape-client/src/main/java/class352.java b/runescape-client/src/main/java/class352.java index 20924cd8ff..6c32f7fbd0 100644 --- a/runescape-client/src/main/java/class352.java +++ b/runescape-client/src/main/java/class352.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mh") public enum class352 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmh;" ) - field4039(0, 1), - @ObfuscatedName("q") + field4027(0, 1), + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmh;" ) - field4035(2, 2), - @ObfuscatedName("f") + field4029(3, 2), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmh;" ) - field4036(1, 3), - @ObfuscatedName("j") + field4032(1, 3), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmh;" ) - field4037(3, 10); + field4030(2, 10); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 882654827 + intValue = 1892879833 ) - final int field4038; - @ObfuscatedName("k") + final int field4031; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1768873207 + intValue = 1388944807 ) - final int field4034; + final int field4028; class352(int var3, int var4) { - this.field4038 = var3; - this.field4034 = var4; - } + this.field4031 = var3; // L: 16 + this.field4028 = var4; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4034; + return this.field4028; // L: 21 } } diff --git a/runescape-client/src/main/java/class353.java b/runescape-client/src/main/java/class353.java index 349ad9cc2e..805db844f9 100644 --- a/runescape-client/src/main/java/class353.java +++ b/runescape-client/src/main/java/class353.java @@ -1,34 +1,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") +@ObfuscatedName("md") public class class353 implements class358 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnz;" ) - public final class380 field4042; + public final class380 field4033; @ObfuscatedSignature( - descriptor = "(Lnt;)V" + descriptor = "(Lnx;)V" ) class353(class381 var1) { - this.field4042 = var1; - } + this.field4033 = var1; // L: 14 + } // L: 15 @ObfuscatedSignature( - descriptor = "(Lmu;)V" + descriptor = "(Lml;)V" ) public class353(class354 var1) { - this(new class381(var1)); - } + this(new class381(var1)); // L: 10 + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1690813919" + garbageValue = "65280" ) - public int method6291(int var1) { - return this.field4042.vmethod6668(var1); + public int method6379(int var1) { + return this.field4033.vmethod6739(var1); // L: 18 } } diff --git a/runescape-client/src/main/java/class354.java b/runescape-client/src/main/java/class354.java index 68a5a73a4d..9630e506d5 100644 --- a/runescape-client/src/main/java/class354.java +++ b/runescape-client/src/main/java/class354.java @@ -1,71 +1,80 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("ml") public abstract class class354 extends class229 implements class407 { @ObfuscatedSignature( - descriptor = "(Ljz;Lkn;I)V" + descriptor = "(Ljd;Lkz;I)V" ) protected class354(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); + super(var1, var2, var3); // L: 15 + } // L: 16 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Lmn;", + garbageValue = "20" + ) + protected abstract class356 vmethod6814(int var1); + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "846699714" + ) + public int method6384() { + return super.field2647; // L: 19 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)Lmp;", - garbageValue = "110" - ) - protected abstract class356 vmethod6749(int var1); - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-112" - ) - public int method6296() { - return super.field2645; - } - - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-1930407702" + garbageValue = "-738928947" ) - public Object vmethod7174(int var1) { - class356 var2 = this.vmethod6749(var1); - return var2 != null && var2.method6320() ? var2.method6317() : null; + public Object vmethod7243(int var1) { + class356 var2 = this.vmethod6814(var1); // L: 23 + return var2 != null && var2.method6407() ? var2.method6408() : null; // L: 24 25 } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;B)Loj;", - garbageValue = "21" + descriptor = "(Lop;B)Lov;", + garbageValue = "-56" ) - public class408 method6309(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class356 var3 = this.vmethod6749(var2); - class408 var4 = new class408(var2); - Class var5 = var3.field4044.field4265; - if (var5 == Integer.class) { - var4.field4353 = var1.readInt(); + public class408 method6391(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 29 + class356 var3 = this.vmethod6814(var2); // L: 30 + class408 var4 = new class408(var2); // L: 31 + Class var5 = var3.field4040.field4274; // L: 32 + if (var5 == Integer.class) { // L: 33 + var4.field4361 = var1.readInt(); } else if (var5 == Long.class) { - var4.field4353 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4353 = var1.readStringCp1252NullCircumfixed(); + var4.field4361 = var1.readLong(); // L: 34 + } else if (var5 == String.class) { // L: 35 + var4.field4361 = var1.readStringCp1252NullCircumfixed(); } else { - if (!class403.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); + if (!class403.class.isAssignableFrom(var5)) { // L: 36 + throw new IllegalStateException(); // L: 45 } try { - class403 var6 = (class403)var5.newInstance(); - var6.method7144(var1); - var4.field4353 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { + class403 var6 = (class403)var5.newInstance(); // L: 38 + var6.method7216(var1); // L: 39 + var4.field4361 = var6; // L: 40 + } catch (InstantiationException var7) { // L: 42 + } catch (IllegalAccessException var8) { // L: 43 } } - return var4; + return var4; // L: 46 } + + @ObfuscatedName("jc") + static final void method6396(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11366 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11367 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 11369 + class408.clientPreferences.brightness = var0; // L: 11371 + Login.savePreferences(); // L: 11372 + } // L: 11373 } diff --git a/runescape-client/src/main/java/class355.java b/runescape-client/src/main/java/class355.java index ef2d50d6b0..9fc8aa75d0 100644 --- a/runescape-client/src/main/java/class355.java +++ b/runescape-client/src/main/java/class355.java @@ -1,34 +1,56 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mh") +@ObfuscatedName("mf") public class class355 extends class356 { public class355(int var1) { - super(var1); + super(var1); // L: 7 + } // L: 8 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lop;II)V", + garbageValue = "-1876316576" + ) + void vmethod6406(Buffer var1, int var2) { } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1820829801" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "65536" ) - void vmethod6328(Buffer var1, int var2) { - } + public static String method6403(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-86" - ) - static void method6311() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); + } else { + byte var5 = AbstractSocket.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 22 + } - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class21.addPlayerToScene(Client.players[var1[var2]], true); + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); // L: 25 } } + return var2.toString(); // L: 28 } } diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java index 13845107a6..2d324cca52 100644 --- a/runescape-client/src/main/java/class356.java +++ b/runescape-client/src/main/java/class356.java @@ -1,102 +1,84 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("mn") public abstract class class356 implements class228 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) - class392 field4044; + class392 field4040; class356(int var1) { - } + } // L: 13 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;II)V", - garbageValue = "-1820829801" + descriptor = "(Lop;II)V", + garbageValue = "-1876316576" ) - abstract void vmethod6328(Buffer var1, int var2); + abstract void vmethod6406(Buffer var1, int var2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lot;I)V", - garbageValue = "1989919652" + descriptor = "(Lop;I)V", + garbageValue = "772115588" ) - public void method6323(Buffer var1) { + public void method6405(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; // L: 43 } - class352[] var3 = new class352[]{class352.field4036, class352.field4035, class352.field4039, class352.field4037}; - class352 var4 = (class352)class128.findEnumerated(var3, var2); - if (var4 != null) { - switch(var4.field4038) { + class352[] var3 = new class352[]{class352.field4027, class352.field4029, class352.field4030, class352.field4032}; // L: 21 + class352 var4 = (class352)UserComparator4.findEnumerated(var3, var2); // L: 23 + if (var4 != null) { // L: 24 + switch(var4.field4031) { // L: 25 case 0: - int var5 = var1.readUnsignedByte(); - this.field4044 = class65.method1876(var5); - if (this.field4044 != null) { + int var5 = var1.readUnsignedByte(); // L: 27 + this.field4040 = NetFileRequest.method5300(var5); // L: 28 + if (this.field4040 != null) { break; } - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 29 case 1: default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 35 case 2: - class128.findEnumerated(PcmPlayer.method744(), var1.readUnsignedByte()); - break; + var1.readStringCp1252NullCircumfixed(); // L: 32 + break; // L: 33 case 3: - var1.readStringCp1252NullCircumfixed(); + UserComparator4.findEnumerated(Occluder.method4483(), var1.readUnsignedByte()); // L: 37 } } else { - this.vmethod6328(var1, var2); + this.vmethod6406(var1, var2); // L: 41 } } } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-17949" + descriptor = "(B)Z", + garbageValue = "1" ) - boolean method6320() { - return this.field4044 != null; + boolean method6407() { + return this.field4040 != null; // L: 48 } - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/Object;", - garbageValue = "-766150747" + garbageValue = "-1684206943" ) - Object method6317() { - if (this.field4044 == class392.field4266) { - return 0; - } else if (this.field4044 == class392.field4273) { - return -1L; + Object method6408() { + if (this.field4040 == class392.field4276) { // L: 52 + return 0; // L: 53 + } else if (this.field4040 == class392.field4270) { // L: 55 + return -1L; // L: 56 } else { - return this.field4044 == class392.field4264 ? "" : null; + return this.field4040 == class392.field4271 ? "" : null; // L: 58 59 61 } } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-560817970" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class116.pcmPlayer1 != null) { - class116.pcmPlayer1.run(); - } - - if (class126.pcmPlayer0 != null) { - class126.pcmPlayer0.run(); - } - - } } diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java index d5edc93dc4..ad447a6224 100644 --- a/runescape-client/src/main/java/class357.java +++ b/runescape-client/src/main/java/class357.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("my") +@ObfuscatedName("mi") public interface class357 { } diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java index 28d4410805..8264479706 100644 --- a/runescape-client/src/main/java/class358.java +++ b/runescape-client/src/main/java/class358.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mg") +@ObfuscatedName("my") public interface class358 extends class357 { } diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java index 85d6dfb365..d345460c42 100644 --- a/runescape-client/src/main/java/class359.java +++ b/runescape-client/src/main/java/class359.java @@ -1,36 +1,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("mu") public class class359 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmu;" ) - static final class359 field4047; - @ObfuscatedName("q") + static final class359 field4043; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmu;" ) - static final class359 field4048; - @ObfuscatedName("f") - String field4046; + static final class359 field4042; + @ObfuscatedName("s") + String field4044; static { - field4047 = new class359("application/json"); - field4048 = new class359("text/plain"); + field4043 = new class359("application/json"); // L: 4 + field4042 = new class359("text/plain"); // L: 5 } class359(String var1) { - this.field4046 = var1; - } + this.field4044 = var1; // L: 9 + } // L: 10 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1364457726" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "33" ) - public String method6333() { - return this.field4046; + public String method6418() { + return this.field4044; // L: 13 } } diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java index 735f35d228..94fd9c7434 100644 --- a/runescape-client/src/main/java/class360.java +++ b/runescape-client/src/main/java/class360.java @@ -1,8 +1,8 @@ import java.io.UnsupportedEncodingException; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ml") +@ObfuscatedName("mg") public interface class360 { - @ObfuscatedName("l") - byte[] method6336(byte var1) throws UnsupportedEncodingException; + @ObfuscatedName("i") + byte[] method6423(int var1) throws UnsupportedEncodingException; } diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java index 517d80710b..b2bc7ff943 100644 --- a/runescape-client/src/main/java/class361.java +++ b/runescape-client/src/main/java/class361.java @@ -1,21 +1,37 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mb") +@ObfuscatedName("mz") public class class361 { - @ObfuscatedName("m") - static final int[] field4056; - @ObfuscatedName("k") - static final int[] field4054; + @ObfuscatedName("o") + static final int[] field4051; + @ObfuscatedName("g") + static final int[] field4047; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1081832115 + ) + static int field4050; static { - field4056 = new int[16384]; - field4054 = new int[16384]; - double var0 = 3.834951969714103E-4D; + field4051 = new int[16384]; // L: 8 + field4047 = new int[16384]; + double var0 = 3.834951969714103E-4D; // L: 12 - for (int var2 = 0; var2 < 16384; ++var2) { - field4056[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); - field4054[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 + field4051[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 + field4047[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 } - } + } // L: 17 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SI)V", + garbageValue = "-1789357355" + ) + public static void method6427(String[] var0, short[] var1) { + class132.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 + } // L: 10 } diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java index e401d4b754..f1d22c836c 100644 --- a/runescape-client/src/main/java/class362.java +++ b/runescape-client/src/main/java/class362.java @@ -1,21 +1,27 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mx") +@ObfuscatedName("mj") public class class362 { - @ObfuscatedName("i") - static final int[] field4063; - @ObfuscatedName("y") - static final int[] field4059; + @ObfuscatedName("b") + static final int[] field4061; + @ObfuscatedName("x") + static final int[] field4062; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1568159649 + ) + static int field4057; static { - field4063 = new int[2048]; - field4059 = new int[2048]; - double var0 = 0.0030679615757712823D; + field4061 = new int[2048]; // L: 13 + field4062 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 - for (int var2 = 0; var2 < 2048; ++var2) { - field4063[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4059[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4061[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 + field4062[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 } - } + } // L: 22 } diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java index d35bdebe55..0e9087cdac 100644 --- a/runescape-client/src/main/java/class367.java +++ b/runescape-client/src/main/java/class367.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ng") +@ObfuscatedName("na") public class class367 extends Node { - @ObfuscatedName("l") - public long field4072; + @ObfuscatedName("i") + public long field4071; public class367(long var1) { - this.field4072 = var1; - } + this.field4071 = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java index 27f64ae791..b1276ab7c1 100644 --- a/runescape-client/src/main/java/class380.java +++ b/runescape-client/src/main/java/class380.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("nz") public interface class380 extends Iterable { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "974003866" + garbageValue = "1882106502" ) - int vmethod6668(int var1); + int vmethod6739(int var1); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1271528922" + garbageValue = "-84615039" ) - void vmethod6669(int var1, Object var2); + void vmethod6736(int var1, Object var2); } diff --git a/runescape-client/src/main/java/class381.java b/runescape-client/src/main/java/class381.java index 779bad7d1c..52b6e5b1b8 100644 --- a/runescape-client/src/main/java/class381.java +++ b/runescape-client/src/main/java/class381.java @@ -2,69 +2,68 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import net.runelite.mapping.ObfuscatedGetter; +import java.util.concurrent.ScheduledExecutorService; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nx") public class class381 implements class380 { - @ObfuscatedName("fk") - @ObfuscatedGetter( - intValue = 185677137 - ) - static int field4217; - @ObfuscatedName("l") - Map field4216; - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("i") + Map field4222; + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Loa;" ) - final class407 field4215; + final class407 field4219; @ObfuscatedSignature( descriptor = "(Loa;)V" ) public class381(class407 var1) { - this.field4215 = var1; - } + this.field4219 = var1; // L: 15 + } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "974003866" + garbageValue = "1882106502" ) - public int vmethod6668(int var1) { - if (this.field4216 != null) { - class408 var2 = (class408)this.field4216.get(var1); + public int vmethod6739(int var1) { + if (this.field4222 != null) { // L: 19 + class408 var2 = (class408)this.field4222.get(var1); // L: 20 if (var2 != null) { - return (Integer)var2.field4353; + return (Integer)var2.field4361; // L: 21 } } - return (Integer)this.field4215.vmethod7174(var1); + return (Integer)this.field4219.vmethod7243(var1); // L: 23 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1271528922" + garbageValue = "-84615039" ) - public void vmethod6669(int var1, Object var2) { - if (this.field4216 == null) { - this.field4216 = new HashMap(); - this.field4216.put(var1, new class408(var1, var2)); + public void vmethod6736(int var1, Object var2) { + if (this.field4222 == null) { // L: 27 + this.field4222 = new HashMap(); // L: 28 + this.field4222.put(var1, new class408(var1, var2)); // L: 29 } else { - class408 var3 = (class408)this.field4216.get(var1); + class408 var3 = (class408)this.field4222.get(var1); // L: 32 if (var3 == null) { - this.field4216.put(var1, new class408(var1, var2)); + this.field4222.put(var1, new class408(var1, var2)); // L: 33 } else { - var3.field4353 = var2; + var3.field4361 = var2; // L: 34 } } - } + } // L: 36 public Iterator iterator() { - return this.field4216 == null ? Collections.emptyList().iterator() : this.field4216.values().iterator(); + return this.field4222 == null ? Collections.emptyList().iterator() : this.field4222.values().iterator(); // L: 39 40 } } diff --git a/runescape-client/src/main/java/class383.java b/runescape-client/src/main/java/class383.java index 8bfd2581a0..243d31898e 100644 --- a/runescape-client/src/main/java/class383.java +++ b/runescape-client/src/main/java/class383.java @@ -1,14 +1,177 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("nn") public class class383 { - @ObfuscatedName("f") - static final char[] field4231; - @ObfuscatedName("j") - static final char[] field4232; + @ObfuscatedName("s") + static final char[] field4236; + @ObfuscatedName("a") + static final char[] field4237; static { - field4231 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4232 = new char[]{'[', ']', '#'}; + field4236 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4237 = new char[]{'[', ']', '#'}; // L: 9 } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Lkz;II)Lib;", + garbageValue = "287793212" + ) + public static PacketBufferNode method6755(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2759, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); // L: 18 + int var5 = var4.packetBuffer.offset; // L: 19 + var4.packetBuffer.writeByte(var0); // L: 20 + String var6 = var1.toLowerCase(); // L: 21 + byte var7 = 0; // L: 22 + if (var6.startsWith("yellow:")) { // L: 23 + var7 = 0; // L: 24 + var1 = var1.substring("yellow:".length()); // L: 25 + } else if (var6.startsWith("red:")) { // L: 27 + var7 = 1; // L: 28 + var1 = var1.substring("red:".length()); // L: 29 + } else if (var6.startsWith("green:")) { // L: 31 + var7 = 2; // L: 32 + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { // L: 35 + var7 = 3; // L: 36 + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { // L: 39 + var7 = 4; // L: 40 + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { // L: 43 + var7 = 5; // L: 44 + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { // L: 47 + var7 = 6; // L: 48 + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { // L: 51 + var7 = 7; // L: 52 + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { // L: 55 + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); // L: 57 + } else if (var6.startsWith("glow1:")) { // L: 59 + var7 = 9; // L: 60 + var1 = var1.substring("glow1:".length()); // L: 61 + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; // L: 64 + var1 = var1.substring("glow2:".length()); // L: 65 + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; // L: 68 + var1 = var1.substring("glow3:".length()); // L: 69 + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { // L: 72 + var7 = 0; // L: 73 + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { // L: 76 + var7 = 1; // L: 77 + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { // L: 80 + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); // L: 82 + } else if (var6.startsWith("cyan:")) { // L: 84 + var7 = 3; // L: 85 + var1 = var1.substring("cyan:".length()); // L: 86 + } else if (var6.startsWith("purple:")) { // L: 88 + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { // L: 92 + var7 = 5; // L: 93 + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; // L: 97 + var1 = var1.substring("flash1:".length()); // L: 98 + } else if (var6.startsWith("flash2:")) { // L: 100 + var7 = 7; // L: 101 + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { // L: 108 + var7 = 9; // L: 109 + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); // L: 114 + } else if (var6.startsWith("glow3:")) { // L: 116 + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 + } + } + + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + class132.method2769(var4.packetBuffer, var1); // L: 167 + if (var0 == class269.field3220.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.method6963(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(IIIILow;Liw;I)V", + garbageValue = "-1849354153" + ) + @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: 11720 + if (var6 > 4225 && var6 < 90000) { // L: 11721 + int var7 = Client.camAngleY & 2047; // L: 11722 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11723 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11724 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11725 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11726 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11727 + int var14 = var5.width / 2 - 25; // L: 11728 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11729 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11730 + byte var17 = 20; // L: 11731 + BoundaryObject.redHintArrowSprite.method7384(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11732 + } else { + WorldMapDecoration.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11734 + } + + } // L: 11735 } diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java index 109d8430dc..01ec4ab47a 100644 --- a/runescape-client/src/main/java/class386.java +++ b/runescape-client/src/main/java/class386.java @@ -1,46 +1,39 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") +@ObfuscatedName("nk") class class386 implements Iterator { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Lbc;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1877062523 + intValue = -1225612599 ) - int field4251; + int field4256; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lno;" ) final class387 this$0; @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lno;)V" ) class386(class387 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 50 } public boolean hasNext() { - return this.field4251 < this.this$0.method6296(); - } - - public Object next() { - int var1 = ++this.field4251 - 1; - class355 var2 = (class355)this.this$0.field4253.get((long)var1); - return var2 != null ? var2 : this.this$0.method6757(var1); + return this.field4256 < this.this$0.method6384(); // L: 54 } public void remove() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 65 + } + + public Object next() { + int var1 = ++this.field4256 - 1; // L: 58 + class355 var2 = (class355)this.this$0.field4260.get((long)var1); // L: 59 + return var2 != null ? var2 : this.this$0.method6820(var1); // L: 60 61 } } diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java index c41c626335..46b08fb601 100644 --- a/runescape-client/src/main/java/class387.java +++ b/runescape-client/src/main/java/class387.java @@ -3,78 +3,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") +@ObfuscatedName("no") public class class387 extends class354 implements class231 { - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - final AbstractArchive field4254; - @ObfuscatedName("f") + final AbstractArchive field4262; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhd;" ) - final DemotingHashTable field4253; - @ObfuscatedName("j") + final DemotingHashTable field4260; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -961082881 + intValue = -1336685485 ) - final int field4255; + final int field4259; @ObfuscatedSignature( - descriptor = "(Ljz;ILkn;Lkl;)V" + descriptor = "(Ljd;ILkz;Lko;)V" ) public class387(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4253 = new DemotingHashTable(64); - this.field4254 = var4; - this.field4255 = var2; + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 + this.field4260 = new DemotingHashTable(64); // L: 15 + this.field4262 = var4; // L: 20 + this.field4259 = var2; // L: 21 + } // L: 22 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Lmn;", + garbageValue = "20" + ) + protected class356 vmethod6814(int var1) { + synchronized(this.field4260) { // L: 26 + class355 var2 = (class355)this.field4260.get((long)var1); // L: 27 + if (var2 == null) { // L: 28 + var2 = this.method6820(var1); // L: 29 + this.field4260.method4673(var2, (long)var1); // L: 30 + } + + return var2; // L: 33 + } } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lmp;", - garbageValue = "110" + descriptor = "(IB)Lmf;", + garbageValue = "67" ) - protected class356 vmethod6749(int var1) { - synchronized(this.field4253) { - class355 var2 = (class355)this.field4253.get((long)var1); - if (var2 == null) { - var2 = this.method6757(var1); - this.field4253.method4588(var2, (long)var1); - } - - return var2; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Lmh;", - garbageValue = "4" - ) - class355 method6757(int var1) { - byte[] var2 = this.field4254.takeFile(this.field4255, var1); - class355 var3 = new class355(var1); + class355 method6820(int var1) { + byte[] var2 = this.field4262.takeFile(this.field4259, var1); // L: 37 + class355 var3 = new class355(var1); // L: 38 if (var2 != null) { - var3.method6323(new Buffer(var2)); + var3.method6405(new Buffer(var2)); // L: 39 } - return var3; + return var3; // L: 40 } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "94" + descriptor = "(I)V", + garbageValue = "1873863120" ) - public void method6750() { - synchronized(this.field4253) { - this.field4253.clear(); + public void method6811() { + synchronized(this.field4260) { // L: 44 + this.field4260.clear(); // L: 45 } - } + } // L: 47 public Iterator iterator() { - return new class386(this); + return new class386(this); // L: 50 } } diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java index 9b3bd23c3b..f04a49da28 100644 --- a/runescape-client/src/main/java/class388.java +++ b/runescape-client/src/main/java/class388.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("nd") public interface class388 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lot;I)V", - garbageValue = "804166773" + descriptor = "(Ljava/lang/Object;Lop;B)V", + garbageValue = "59" ) - void vmethod6815(Object var1, Buffer var2); + void vmethod6878(Object var1, Buffer var2); - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lot;I)Ljava/lang/Object;", - garbageValue = "1421946597" + descriptor = "(Lop;I)Ljava/lang/Object;", + garbageValue = "-2140031619" ) - Object vmethod6822(Buffer var1); + Object vmethod6883(Buffer var1); } diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 6770cb254d..26bdfa5c2f 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,32 +1,40 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ne") final class class389 implements class388 { - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lot;I)V", - garbageValue = "804166773" + descriptor = "Lko;" ) - public void vmethod6815(Object var1, Buffer var2) { - this.method6770((Integer)var1, var2); + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lop;B)V", + garbageValue = "59" + ) + public void vmethod6878(Object var1, Buffer var2) { + this.method6830((Integer)var1, var2); // L: 20 + } // L: 21 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lop;I)Ljava/lang/Object;", + garbageValue = "-2140031619" + ) + public Object vmethod6883(Buffer var1) { + return var1.readInt(); // L: 16 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lot;I)Ljava/lang/Object;", - garbageValue = "1421946597" + descriptor = "(Ljava/lang/Integer;Lop;I)V", + garbageValue = "1046823792" ) - public Object vmethod6822(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lot;I)V", - garbageValue = "1391168197" - ) - void method6770(Integer var1, Buffer var2) { - var2.writeInt(var1); - } + void method6830(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java index 81e81b6f4e..bc4ef2ab7e 100644 --- a/runescape-client/src/main/java/class390.java +++ b/runescape-client/src/main/java/class390.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ow") +@ObfuscatedName("ok") public class class390 { - @ObfuscatedName("l") - static final int[] field4258; + @ObfuscatedName("i") + static final int[] field4266; static { - field4258 = 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}; + field4266 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 } } diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java index 23a4ab99b3..6d88cb96db 100644 --- a/runescape-client/src/main/java/class391.java +++ b/runescape-client/src/main/java/class391.java @@ -1,42 +1,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oi") +@ObfuscatedName("ot") final class class391 implements class388 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lot;I)V", - garbageValue = "804166773" + descriptor = "(Ljava/lang/Object;Lop;B)V", + garbageValue = "59" ) - public void vmethod6815(Object var1, Buffer var2) { - this.method6788((Long)var1, var2); + public void vmethod6878(Object var1, Buffer var2) { + this.method6845((Long)var1, var2); // L: 33 + } // L: 34 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lop;I)Ljava/lang/Object;", + garbageValue = "-2140031619" + ) + public Object vmethod6883(Buffer var1) { + return var1.readLong(); // L: 29 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lot;I)Ljava/lang/Object;", - garbageValue = "1421946597" + descriptor = "(Ljava/lang/Long;Lop;I)V", + garbageValue = "-1424253261" ) - public Object vmethod6822(Buffer var1) { - return var1.readLong(); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lot;I)V", - garbageValue = "-1125852058" - ) - void method6788(Long var1, Buffer var2) { - var2.writeLong(var1); - } - - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" - ) - static final void method6795() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; - } + void method6845(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 25 + } // L: 26 } diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java index 1f820c9e0a..2353e23cf9 100644 --- a/runescape-client/src/main/java/class392.java +++ b/runescape-client/src/main/java/class392.java @@ -3,157 +3,226 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("og") public class class392 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) - public static final class392 field4266; - @ObfuscatedName("q") + public static final class392 field4276; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) - public static final class392 field4273; - @ObfuscatedName("f") + public static final class392 field4270; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Log;" ) - public static final class392 field4264; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - static StudioGame field4267; - @ObfuscatedName("mv") + public static final class392 field4271; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2078867917 + intValue = 309429929 ) - @Export("menuY") - static int menuY; - @ObfuscatedName("j") + final int field4269; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1376860317 + intValue = -489911481 ) - final int field4263; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -490684947 - ) - public final int field4260; - @ObfuscatedName("k") - public final Class field4265; - @ObfuscatedName("t") + public final int field4273; + @ObfuscatedName("g") + public final Class field4274; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnd;" ) - final class388 field4261; + public final class388 field4275; static { - field4266 = new class392(1, 0, Integer.class, new class389()); - field4273 = new class392(2, 1, Long.class, new class391()); - field4264 = new class392(0, 2, String.class, new class393()); + field4276 = new class392(2, 0, Integer.class, new class389()); // L: 10 + field4270 = new class392(1, 1, Long.class, new class391()); // L: 23 + field4271 = new class392(0, 2, String.class, new class393()); // L: 36 } @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lnb;)V" + descriptor = "(IILjava/lang/Class;Lnd;)V" ) class392(int var1, int var2, Class var3, class388 var4) { - this.field4263 = var1; - this.field4260 = var2; - this.field4265 = var3; - this.field4261 = var4; - } + this.field4269 = var1; // L: 59 + this.field4273 = var2; // L: 60 + this.field4274 = var3; // L: 61 + this.field4275 = var4; // L: 62 + } // L: 63 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4260; + return this.field4273; // L: 79 } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lot;B)Ljava/lang/Object;", - garbageValue = "15" + descriptor = "(Lop;I)Ljava/lang/Object;", + garbageValue = "254534065" ) - public Object method6800(Buffer var1) { - return this.field4261.vmethod6822(var1); + public Object method6858(Buffer var1) { + return this.field4275.vmethod6883(var1); // L: 83 } - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lot;I)V", - garbageValue = "-20110377" + descriptor = "(S)[Log;", + garbageValue = "-11950" ) - public static void method6797(Object var0, Buffer var1) { - class388 var2 = method6798(var0.getClass()); - var2.vmethod6815(var0, var1); + public static class392[] method6855() { + return new class392[]{field4276, field4270, field4271}; // L: 55 } - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lnb;", - garbageValue = "1660700582" + descriptor = "(Ljava/lang/Class;I)Log;", + garbageValue = "1132071847" ) - static class388 method6798(Class var0) { - class392[] var2 = new class392[]{field4266, field4264, field4273}; - class392[] var3 = var2; - int var4 = 0; + public static class392 method6856(Class var0) { + class392[] var1 = method6855(); // L: 67 - class392 var1; - while (true) { - if (var4 >= var3.length) { - var1 = null; - break; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 68 + class392 var3 = var1[var2]; // L: 69 + if (var3.field4274 == var0) { + return var3; // L: 71 + } + } + + return null; // L: 75 + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "1" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5643 + int var4 = var1 >> 7; // L: 5644 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5645 + int var5 = var2; // L: 5646 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5647 + var5 = var2 + 1; } - class392 var5 = var3[var4]; - if (var5.field4265 == var0) { - var1 = var5; - break; + int var6 = var0 & 127; // L: 5648 + int var7 = var1 & 127; // L: 5649 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5650 + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5651 + return var9 * var7 + var8 * (128 - var7) >> 7; // L: 5652 + } else { + return 0; + } + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "106" + ) + static void method6871(int var0, int var1) { + int var2 = Login.fontBold12.stringWidth("Choose Option"); // L: 8231 + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8232 + var4 = Login.fontBold12.stringWidth(method6873(var3)); // L: 8233 + if (var4 > var2) { // L: 8234 + var2 = var4; + } + } + + var2 += 8; // L: 8236 + var3 = Client.menuOptionsCount * 15 + 22; // L: 8237 + var4 = var0 - var2 / 2; // L: 8238 + if (var2 + var4 > GameEngine.canvasWidth) { // L: 8239 + var4 = GameEngine.canvasWidth - var2; + } + + if (var4 < 0) { // L: 8240 + var4 = 0; + } + + int var5 = var1; // L: 8241 + if (var3 + var1 > KeyHandler.canvasHeight) { // L: 8242 + var5 = KeyHandler.canvasHeight - var3; + } + + if (var5 < 0) { // L: 8243 + var5 = 0; + } + + SecureRandomCallable.menuX = var4; // L: 8244 + Frames.menuY = var5; // L: 8245 + ObjectComposition.menuWidth = var2; // L: 8246 + StudioGame.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8247 + } // L: 8248 + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-2087598232" + ) + static String method6873(int var0) { + if (var0 < 0) { // L: 9316 + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9317 9318 + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-2121670407" + ) + static final void method6872(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 10154 + int var7 = var3 - var1; // L: 10155 + int var8 = var6 >= 0 ? var6 : -var6; // L: 10156 + int var9 = var7 >= 0 ? var7 : -var7; // L: 10157 + int var10 = var8; // L: 10158 + if (var8 < var9) { // L: 10159 + var10 = var9; + } + + if (var10 != 0) { // L: 10160 + int var11 = (var6 << 16) / var10; // L: 10161 + int var12 = (var7 << 16) / var10; // L: 10162 + if (var12 <= var11) { // L: 10163 + var11 = -var11; + } else { + var12 = -var12; // L: 10164 } - ++var4; + int var13 = var5 * var12 >> 17; // L: 10165 + int var14 = var5 * var12 + 1 >> 17; // L: 10166 + int var15 = var5 * var11 >> 17; // L: 10167 + int var16 = var5 * var11 + 1 >> 17; // L: 10168 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10169 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10170 + int var17 = var0 + var13; // L: 10171 + int var18 = var0 - var14; // L: 10172 + int var19 = var0 + var6 - var14; // L: 10173 + int var20 = var0 + var6 + var13; // L: 10174 + int var21 = var15 + var1; // L: 10175 + int var22 = var1 - var16; // L: 10176 + int var23 = var7 + var1 - var16; // L: 10177 + int var24 = var15 + var7 + var1; // L: 10178 + Rasterizer3D.method4210(var17, var18, var19); // L: 10179 + Rasterizer3D.method4213(var21, var22, var23, var17, var18, var19, var4); // L: 10180 + Rasterizer3D.method4210(var17, var19, var20); // L: 10181 + Rasterizer3D.method4213(var21, var23, var24, var17, var19, var20, var4); // L: 10182 } - - if (var1 == null) { - throw new IllegalArgumentException(); - } else { - return var1.field4261; - } - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "11165" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field708 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (class12.getWindowedMode() == 1) { - class21.client.setMaxCanvasSize(765, 503); - } else { - class21.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - PacketBufferNode var1 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class12.getWindowedMode()); - var1.packetBuffer.writeShort(Huffman.canvasWidth); - var1.packetBuffer.writeShort(MouseRecorder.canvasHeight); - Client.packetWriter.addNode(var1); - } - - } + } // L: 10183 } diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java index d2709acb39..0dbda2d318 100644 --- a/runescape-client/src/main/java/class393.java +++ b/runescape-client/src/main/java/class393.java @@ -1,32 +1,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("os") +@ObfuscatedName("on") final class class393 implements class388 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lot;I)V", - garbageValue = "804166773" + descriptor = "(Ljava/lang/Object;Lop;B)V", + garbageValue = "59" ) - public void vmethod6815(Object var1, Buffer var2) { - this.method6814((String)var1, var2); + public void vmethod6878(Object var1, Buffer var2) { + this.method6876((String)var1, var2); // L: 46 + } // L: 47 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lop;I)Ljava/lang/Object;", + garbageValue = "-2140031619" + ) + public Object vmethod6883(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lot;I)Ljava/lang/Object;", - garbageValue = "1421946597" + descriptor = "(Ljava/lang/String;Lop;S)V", + garbageValue = "4140" ) - public Object vmethod6822(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } + void method6876(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 38 + } // L: 39 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lot;I)V", - garbageValue = "1290124778" + descriptor = "(Lko;Ljava/lang/String;Ljava/lang/String;I)[Loe;", + garbageValue = "-910424433" ) - void method6814(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); + public static IndexedSprite[] method6882(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 58 + int var4 = var0.getFileId(var3, var2); // L: 59 + return UserComparator5.method2478(var0, var3, var4); // L: 60 } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-496918873" + ) + static final void method6885(int var0, int var1, int var2, int var3) { + class114.method2538(); // L: 5609 + } // L: 5610 } diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java deleted file mode 100644 index a78983cf53..0000000000 --- a/runescape-client/src/main/java/class395.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("op") -public class class395 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; -} diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java deleted file mode 100644 index bb4ad8b81f..0000000000 --- a/runescape-client/src/main/java/class396.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("oc") -public class class396 { - @ObfuscatedName("b") - @Export("cacheParentPaths") - static String[] cacheParentPaths; -} diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java index 85beae1339..decebc0721 100644 --- a/runescape-client/src/main/java/class397.java +++ b/runescape-client/src/main/java/class397.java @@ -3,17 +3,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") +@ObfuscatedName("oi") public final class class397 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 4016542250161700293L + longValue = -4044727011412295925L ) - static long field4283; - @ObfuscatedName("g") + static long field4289; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = 99400153304744329L + ) + static long field4288; + @ObfuscatedName("x") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1663146092" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class269.addChatMessage(var0, var1, var2, (String)null); // L: 23 + } // L: 24 } diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java deleted file mode 100644 index e64d55c7be..0000000000 --- a/runescape-client/src/main/java/class398.java +++ /dev/null @@ -1,78 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ou") -public class class398 { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "0" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class414.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class135.SpriteBuffer_xOffsets = new int[class414.SpriteBuffer_spriteCount]; - class131.SpriteBuffer_yOffsets = new int[class414.SpriteBuffer_spriteCount]; - class414.SpriteBuffer_spriteWidths = new int[class414.SpriteBuffer_spriteCount]; - class16.SpriteBuffer_spriteHeights = new int[class414.SpriteBuffer_spriteCount]; - class414.SpriteBuffer_pixels = new byte[class414.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8; - class414.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class408.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { - class135.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { - class131.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { - class414.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { - class16.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class351.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class351.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class351.SpriteBuffer_spritePalette[var3] == 0) { - class351.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { - int var4 = class414.SpriteBuffer_spriteWidths[var3]; - int var5 = class16.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - class414.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var10 * var4] = var1.readByte(); - } - } - } - } - - } -} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java deleted file mode 100644 index 1582002e9f..0000000000 --- a/runescape-client/src/main/java/class4.java +++ /dev/null @@ -1,78 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("m") -public final class class4 { - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Loz;" - ) - static IndexedSprite field8; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lco;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = 586577523 - ) - public static int field13; - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "Lon;" - ) - @Export("compass") - static SpritePixels compass; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "125" - ) - public static void method19(int var0) { - if (class247.musicPlayerStatus != 0) { - class247.musicTrackVolume = var0; - } else { - class247.midiPcmStream.setPcmStreamVolume(var0); - } - - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(IIII)Lct;", - garbageValue = "-2020922955" - ) - static final InterfaceParent method23(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class17.Widget_resetModelFrames(var1); - Widget var4 = HealthBarUpdate.getWidget(var0); - class16.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - class16.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - class132.method2699(); - TaskHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - WorldMapScaleHandler.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } -} diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java index 0ca4a05ad6..f2755874c4 100644 --- a/runescape-client/src/main/java/class403.java +++ b/runescape-client/src/main/java/class403.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oq") +@ObfuscatedName("or") public interface class403 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lot;I)V" + descriptor = "(Lop;I)V" ) - void method7144(Buffer var1); + void method7216(Buffer var1); } diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java index ec40c24990..21618fd5be 100644 --- a/runescape-client/src/main/java/class404.java +++ b/runescape-client/src/main/java/class404.java @@ -3,79 +3,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("os") public class class404 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Los;" ) - public static final class404 field4344; - @ObfuscatedName("q") + public static final class404 field4351; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Los;" ) - public static final class404 field4348; - @ObfuscatedName("f") + public static final class404 field4352; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Los;" ) - static final class404 field4343; - @ObfuscatedName("j") + static final class404 field4350; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lom;" - ) - static final class404 field4346; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - static final class404 field4345; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Los;" ) static final class404 field4349; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1980513539 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Los;" ) - final int field4347; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1627487491 + static final class404 field4353; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Los;" ) - final int field4341; + static final class404 field4354; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1390706717 + ) + final int field4355; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -611515957 + ) + final int field4356; static { - field4344 = new class404(3, 0); - field4348 = new class404(0, 2); - field4343 = new class404(1, 5); - field4346 = new class404(4, 6); - field4345 = new class404(2, 7); - field4349 = new class404(5, 8); + field4351 = new class404(2, 0); // L: 8 + field4352 = new class404(5, 2); // L: 9 + field4350 = new class404(3, 5); // L: 10 + field4349 = new class404(0, 6); // L: 11 + field4353 = new class404(1, 7); // L: 12 + field4354 = new class404(4, 8); // L: 13 } class404(int var1, int var2) { - this.field4347 = var1; - this.field4341 = var2; + this.field4355 = var1; // L: 18 + this.field4356 = var2; // L: 19 + } // L: 20 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1832160876" + ) + public boolean method7220() { + return this == field4352; // L: 27 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4341; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-433884264" - ) - public boolean method7148() { - return this == field4348; + return this.field4356; // L: 23 } } diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java index 2f20593863..b2a1a5f68f 100644 --- a/runescape-client/src/main/java/class407.java +++ b/runescape-client/src/main/java/class407.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("oa") public interface class407 { - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-1930407702" + garbageValue = "-738928947" ) - Object vmethod7174(int var1); + Object vmethod7243(int var1); } diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java index 155c534123..bb662ba18e 100644 --- a/runescape-client/src/main/java/class408.java +++ b/runescape-client/src/main/java/class408.java @@ -1,47 +1,54 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") +@ObfuscatedName("ov") public class class408 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1905362917 + @ObfuscatedName("tb") + @ObfuscatedSignature( + descriptor = "Lcs;" ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1474390477 + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lko;" ) - public final int field4354; - @ObfuscatedName("q") - public Object field4353; + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -196401313 + ) + public final int field4363; + @ObfuscatedName("w") + public Object field4361; public class408(int var1) { - this.field4354 = var1; - } + this.field4363 = var1; // L: 8 + } // L: 9 public class408(int var1, Object var2) { - this.field4354 = var1; - this.field4353 = var2; - } + this.field4363 = var1; // L: 12 + this.field4361 = var2; // L: 13 + } // L: 14 public int hashCode() { - return super.hashCode(); + return super.hashCode(); // L: 17 } public boolean equals(Object var1) { - if (!(var1 instanceof class408)) { + if (!(var1 instanceof class408)) { // L: 21 return false; } else { - class408 var2 = (class408)var1; - if (var2.field4353 == null && this.field4353 != null) { + class408 var2 = (class408)var1; // L: 22 + if (var2.field4361 == null && this.field4361 != null) { // L: 23 return false; - } else if (this.field4353 == null && var2.field4353 != null) { + } else if (this.field4361 == null && var2.field4361 != null) { // L: 24 return false; } else { - return this.field4354 == var2.field4354 && var2.field4353.equals(this.field4353); + return var2.field4363 == this.field4363 && var2.field4361.equals(this.field4361); // L: 25 } } } diff --git a/runescape-client/src/main/java/class414.java b/runescape-client/src/main/java/class414.java index dfb2e5aa4c..4e3aaa67cc 100644 --- a/runescape-client/src/main/java/class414.java +++ b/runescape-client/src/main/java/class414.java @@ -2,24 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ol") +@ObfuscatedName("ou") public class class414 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -749924829 + intValue = -1617488597 ) @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("q") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 141807557 + intValue = -34182123 ) @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("k") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 627658403 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("a") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("o") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; @ObfuscatedName("e") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; } diff --git a/runescape-client/src/main/java/class423.java b/runescape-client/src/main/java/class423.java new file mode 100644 index 0000000000..27865516a6 --- /dev/null +++ b/runescape-client/src/main/java/class423.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("px") +public class class423 { + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = -5266964682806439461L + ) + public static long field4436; +} diff --git a/runescape-client/src/main/java/class45.java b/runescape-client/src/main/java/class45.java index 504402df68..15c1b6e638 100644 --- a/runescape-client/src/main/java/class45.java +++ b/runescape-client/src/main/java/class45.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("au") public interface class45 { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Laq;", - garbageValue = "666653269" + descriptor = "(S)Lak;", + garbageValue = "6712" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 0509f8c650..e699d63f2f 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -4,77 +4,77 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("g") public class class5 implements class2 { - @ObfuscatedName("l") - final MessageDigest field16; + @ObfuscatedName("i") + final MessageDigest field9; @ObfuscatedSignature( - descriptor = "(Le;)V" + descriptor = "(Lj;)V" ) class5(class8 var1) { - this.field16 = this.method30(); + this.field9 = this.method26(); // L: 14 + } // L: 15 + + @ObfuscatedName("i") + boolean method22(int var1, String var2, long var3) { + byte[] var5 = this.method23(var2, var3); // L: 18 + return method25(var5) >= var1; // L: 19 } - @ObfuscatedName("l") - boolean method25(int var1, String var2, long var3) { - byte[] var5 = this.method28(var2, var3); - return method26(var5) >= var1; - } - - @ObfuscatedName("j") - byte[] method28(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); - var4.append(var1).append(Long.toHexString(var2)); - this.field16.reset(); + @ObfuscatedName("a") + byte[] method23(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); // L: 56 + var4.append(var1).append(Long.toHexString(var2)); // L: 57 + this.field9.reset(); // L: 58 try { - this.field16.update(var4.toString().getBytes("UTF-8")); - } catch (UnsupportedEncodingException var6) { - var6.printStackTrace(); + this.field9.update(var4.toString().getBytes("UTF-8")); // L: 60 + } catch (UnsupportedEncodingException var6) { // L: 62 + var6.printStackTrace(); // L: 63 } - return this.field16.digest(); + return this.field9.digest(); // L: 65 } - @ObfuscatedName("m") - MessageDigest method30() { + @ObfuscatedName("o") + MessageDigest method26() { try { - return MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException var2) { - var2.printStackTrace(); - return null; + return MessageDigest.getInstance("SHA-256"); // L: 70 + } catch (NoSuchAlgorithmException var2) { // L: 72 + var2.printStackTrace(); // L: 73 + return null; // L: 74 } } - @ObfuscatedName("q") - static int method26(byte[] var0) { - int var1 = 0; - byte[] var2 = var0; + @ObfuscatedName("w") + static int method25(byte[] var0) { + int var1 = 0; // L: 23 + byte[] var2 = var0; // L: 25 - for (int var3 = 0; var3 < var2.length; ++var3) { - byte var4 = var2[var3]; - int var5 = method32(var4); - var1 += var5; - if (var5 != 8) { + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 + byte var4 = var2[var3]; // L: 27 + int var5 = method24(var4); // L: 29 + var1 += var5; // L: 30 + if (var5 != 8) { // L: 31 break; } } - return var1; + return var1; // L: 37 } - @ObfuscatedName("f") - static int method32(byte var0) { - int var1 = 0; - if (var0 == 0) { - var1 = 8; + @ObfuscatedName("s") + static int method24(byte var0) { + int var1 = 0; // L: 41 + if (var0 == 0) { // L: 42 + var1 = 8; // L: 43 } else { - for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { - ++var1; + for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { // L: 46 47 49 + ++var1; // L: 48 } } - return var1; + return var1; // L: 52 } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 347762edd7..008dbe6380 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1,68 +1,113 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("bx") public class class54 { - @ObfuscatedName("l") + @ObfuscatedName("tu") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lnp;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lkf;" ) @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1918136037 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("ek") + @ObfuscatedName("p") + static byte[][][] field419; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "[Loe;" ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("archive20") - static Archive archive20; + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; static { - reflectionChecks = new IterableNodeDeque(); + reflectionChecks = new IterableNodeDeque(); // L: 17 } - @ObfuscatedName("gk") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2001" + descriptor = "(II)I", + garbageValue = "-1254980557" ) - static final void method1055() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == VertexNormal.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field536); - if (var0.isFinished) { - var0.remove(); - } else { - PlayerComposition.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); + public static int method1111(int var0) { + return class138.method2827(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 60 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIB)Lbf;", + garbageValue = "108" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 39 + return var2.getMessage(var1); // L: 40 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILbp;ZB)I", + garbageValue = "-18" + ) + static int method1101(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1185 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1186 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.itemId; // L: 1187 + return 1; // L: 1188 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1190 + if (var3.itemId != -1) { // L: 1191 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1192 + } + + return 1; // L: 1193 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1195 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1196 + return 1; // L: 1197 + } else { + return 2; // L: 1199 + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "86" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4463 + if (class174.loadInterface(var0)) { // L: 4464 + Widget[] var1 = WorldMapSection1.Widget_interfaceComponents[var0]; // L: 4465 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4466 + Widget var3 = var1[var2]; // L: 4467 + if (var3.onLoad != null) { // L: 4468 + ScriptEvent var4 = new ScriptEvent(); // L: 4469 + var4.widget = var3; // L: 4470 + var4.args = var3.onLoad; // L: 4471 + SoundSystem.runScript(var4, 5000000, 0); // L: 4472 } } - } else { - var0.remove(); + } } + } // L: 4475 - } - - @ObfuscatedName("ib") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1736232978" + descriptor = "(I)Lng;", + garbageValue = "-542542901" ) - static final String method1057(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; + @Export("getWorldMap") + static WorldMap getWorldMap() { + return class133.worldMap; // L: 648 } } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 3ca22e138e..12a232cc43 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -3,75 +3,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("e") public enum class6 implements MouseWheel { - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lt;" + descriptor = "Le;" ) - field17(0, 0); + field14(0, 0); - @ObfuscatedName("tm") + @ObfuscatedName("ql") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lle;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("q") + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -610033617 + intValue = -1812774783 ) - final int field18; - @ObfuscatedName("f") + public final int field12; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 978789347 + intValue = 947219699 ) - final int field19; + final int field13; class6(int var3, int var4) { - this.field18 = var3; - this.field19 = var4; - } + this.field12 = var3; // L: 16 + this.field13 = var4; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field19; + return this.field13; // L: 21 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2029085795" - ) - public static void method45() { - class54.reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-728834449" + garbageValue = "-1975834785" ) - public static boolean method43(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1585134440" - ) - static void method44() { - if (class174.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - + @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 } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index f69f50dc5f..e456f3b4b1 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,102 +1,60 @@ import java.math.BigInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bv") public class class65 { - @ObfuscatedName("m") - static final BigInteger field856; - @ObfuscatedName("k") - static final BigInteger field852; + @ObfuscatedName("o") + static final BigInteger field822; + @ObfuscatedName("g") + static final BigInteger field823; + @ObfuscatedName("iy") + @ObfuscatedGetter( + intValue = -1036778265 + ) + @Export("cameraZ") + static int cameraZ; static { - field856 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field852 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field822 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field823 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lod;", - garbageValue = "3" + descriptor = "(II)I", + garbageValue = "-2099438942" ) - public static class392 method1876(int var0) { - int var1 = class390.field4258[var0]; - if (var1 == 1) { - return class392.field4266; - } else if (var1 == 2) { - return class392.field4264; - } else { - return var1 == 3 ? class392.field4273 : null; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lfd;", - garbageValue = "-1764753351" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-61" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 61 + if (var0 < 0 || var0 >= 65536) { // L: 62 + var0 >>>= 16; // L: 63 + var1 += 16; // L: 64 } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; + if (var0 >= 256) { // L: 66 + var0 >>>= 8; // L: 67 + var1 += 8; // L: 68 } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } + if (var0 >= 16) { // L: 70 + var0 >>>= 4; // L: 71 + var1 += 4; // L: 72 + } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-104" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + if (var0 >= 4) { // L: 74 + var0 >>>= 2; // L: 75 + var1 += 2; // L: 76 + } + + if (var0 >= 1) { // L: 78 + var0 >>>= 1; // L: 79 + ++var1; // L: 80 + } + + return var0 + var1; // L: 82 } } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index 1a259f8714..5c0b80fa80 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -1,87 +1,98 @@ -import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bz") public class class67 { - @ObfuscatedName("l") - static final BigInteger field864; - @ObfuscatedName("q") - static final BigInteger field866; - @ObfuscatedName("lh") + @ObfuscatedName("ru") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldm;" ) - @Export("localPlayer") - static Player localPlayer; + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("i") + static final BigInteger field840; + @ObfuscatedName("w") + static final BigInteger field843; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1442166637 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1013200423 + ) + public static int field845; static { - field864 = new BigInteger("10001", 16); - field866 = new BigInteger("af87d84e6c1040d7966e705070a42393ba8b386e15205b6fb3d688be49039c3fbcc13093eaef5b4f93aecdafa3f8d486196fe7d33ba78a1683eb448d22bd7b994189c9e52db6f532b86ddcc549b641f2ac0d0b411f3fa2c666c877cb7ab8091b2989a105f84cb69b27eacd98c19d098d6f36e6ba7bbf156c082b45f6aa7fd5db", 16); + field840 = new BigInteger("10001", 16); // L: 6 + field843 = new BigInteger("933e616091e0666f756e1cf08e3239d7a471aba3ebf0013b32d4a351ebb206e47fdbc3569683ebc86c76a55cceedfdbf0f28f0b42ec697e24c1f322aa60a9d9d013cd2d943b842db981f90c6def19c4d25c86b0e41ae6b731b56da6563244706ef5c098a398b7d43f386072a206378425d78e612b3fcbc4b4be5108da43a0745", 16); // L: 7 } - @ObfuscatedName("q") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lkl;IIIZB)V", - garbageValue = "4" + descriptor = "(ILbp;ZI)I", + garbageValue = "-782668076" ) - public static void method1886(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = var0; - Skills.musicTrackGroupId = var1; - class137.musicTrackFileId = var2; - class247.musicTrackVolume = var3; - class247.musicTrackBoolean = var4; - class247.pcmSampleLength = 10000; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)Lcq;", - garbageValue = "-21" - ) - static ClientPreferences method1887() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = World.getPreferencesFile("", class392.field4267.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); - } + static int method1914(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4385 + ++class14.Interpreter_intStackSize; // L: 4386 + return 1; // L: 4387 + } else if (var0 == 7101) { // L: 4389 + class295.Interpreter_stringStackSize += 2; // L: 4390 + return 1; // L: 4391 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4393 + if (var0 == 7106) { // L: 4397 + ++class14.Interpreter_intStackSize; // L: 4398 + return 1; // L: 4399 + } else if (var0 == 7107) { // L: 4401 + ++class14.Interpreter_intStackSize; // L: 4402 + return 1; // L: 4403 + } else if (var0 == 7108) { // L: 4405 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Language.method5521() ? 1 : 0; // L: 4406 + return 1; // L: 4407 + } else if (var0 == 7110) { // L: 4409 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4410 + return 1; // L: 4411 + } else if (var0 == 7120) { // L: 4413 + --class14.Interpreter_intStackSize; // L: 4414 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4415 + return 1; // L: 4416 + } else if (var0 == 7121) { // L: 4418 + class14.Interpreter_intStackSize -= 2; // L: 4419 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4420 + return 1; // L: 4421 + } else if (var0 == 7122) { // L: 4423 + class14.Interpreter_intStackSize -= 2; // L: 4424 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4425 + return 1; // L: 4426 + } else { + return 2; // L: 4428 } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { + } else { + ++class14.Interpreter_intStackSize; // L: 4394 + return 1; // L: 4395 } - - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; } - @ObfuscatedName("y") + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "843333300" + descriptor = "(II)V", + garbageValue = "621915998" ) - public static final void method1888(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } + static final void method1913(int var0) { + if (var0 >= 0) { // L: 8261 + int var1 = Client.menuArguments1[var0]; // L: 8262 + int var2 = Client.menuArguments2[var0]; // L: 8263 + int var3 = Client.menuOpcodes[var0]; // L: 8264 + int var4 = Client.menuIdentifiers[var0]; // L: 8265 + String var5 = Client.menuActions[var0]; // L: 8266 + String var6 = Client.menuTargets[var0]; // L: 8267 + class14.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8268 + } + } // L: 8269 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 43c44d9022..d62ee3dfe7 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,536 +1,163 @@ -import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("p") public class class7 { - @ObfuscatedName("ko") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Lgw;" ) - static Widget field31; - @ObfuscatedName("l") - ExecutorService field28; - @ObfuscatedName("q") - Future field25; - @ObfuscatedName("f") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "[Loe;" ) - final Buffer field30; - @ObfuscatedName("j") + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("i") + ExecutorService field17; + @ObfuscatedName("w") + Future field20; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lop;" ) - final class3 field27; + final Buffer field18; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "La;" + ) + final class3 field19; @ObfuscatedSignature( - descriptor = "(Lot;Lj;)V" + descriptor = "(Lop;La;)V" ) public class7(Buffer var1, class3 var2) { - this.field28 = Executors.newSingleThreadExecutor(); - this.field30 = var1; - this.field27 = var2; - this.method50(); - } + this.field17 = Executors.newSingleThreadExecutor(); // L: 10 + this.field18 = var1; // L: 16 + this.field19 = var2; // L: 17 + this.method49(); // L: 18 + } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1905557215" + garbageValue = "830393061" ) - public boolean method47() { - return this.field25.isDone(); + public boolean method46() { + return this.field20.isDone(); // L: 22 } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-30" - ) - public void method48() { - this.field28.shutdown(); - this.field28 = null; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Lot;", - garbageValue = "572795942" - ) - public Buffer method49() { - try { - return (Buffer)this.field25.get(); - } catch (Exception var2) { - return null; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - void method50() { - this.field25 = this.field28.submit(new class1(this, this.field30, this.field27)); - } - - @ObfuscatedName("f") - public static boolean method60(long var0) { - return 0L != var0 && !class133.method2702(var0); - } - - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2027400606" + garbageValue = "1036380916" ) - static void method63() { - if (Login.clearLoginScreen) { - SoundCache.titleboxSprite = null; - class132.titlebuttonSprite = null; - Login.runesSprite = null; - Login.leftTitleSprite = null; - Login.rightTitleSprite = null; - ClanChannelMember.logoSprite = null; - class16.title_muteSprite = null; - class397.options_buttons_0Sprite = null; - FileSystem.options_buttons_2Sprite = null; - BoundaryObject.worldSelectBackSprites = null; - NetFileRequest.worldSelectFlagSprites = null; - EnumComposition.worldSelectArrows = null; - class320.worldSelectStars = null; - Client.field563 = null; - Login.loginScreenRunesAnimation.method2164(); - CollisionMap.method3417(2); - if (NetCache.NetCache_socket != null) { - try { - Buffer var0 = new Buffer(4); - var0.writeByte(2); - var0.writeMedium(0); - NetCache.NetCache_socket.write(var0.array, 0, 4); - } catch (IOException var3) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var2) { - } + public void method47() { + this.field17.shutdown(); // L: 26 + this.field17 = null; // L: 27 + } // L: 28 - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = false; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Lop;", + garbageValue = "945217619" + ) + public Buffer method48() { + try { + return (Buffer)this.field20.get(); // L: 32 + } catch (Exception var2) { // L: 34 + return null; // L: 35 } } - @ObfuscatedName("k") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIIILhy;Lfy;B)V", - garbageValue = "71" + descriptor = "(I)V", + garbageValue = "1187826160" ) - static final void method64(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } + void method49() { + this.field20 = this.field17.submit(new class1(this, this.field18, this.field19)); // L: 40 + } // L: 41 - ObjectComposition var8 = class245.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = class247.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - class300.method5457(var0, var1, var2, var8, var4); - } - - Object var29; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var28; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method4208(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field985[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - class281.field3323[var0][var1][var2] = 50; - class281.field3323[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - class281.field3323[var0][var1][var2 + 1] = 50; - class281.field3323[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Huffman.field3203[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - class281.field3323[var0][var1 + 1][var2] = 50; - class281.field3323[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Huffman.field3203[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - class281.field3323[var0][var1][var2] = 50; - class281.field3323[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3416(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method4214(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field986[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class281.field3323[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class281.field3323[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class281.field3323[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class281.field3323[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3416(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var22; - if (var5 == 2) { - var22 = var4 + 1 & 3; - Object var24; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var24 = var8.getEntity(2, var22, var15, var17, var16, var18); - } else { - var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field985[var4], Tiles.field985[var22], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 585; - var10000 = Huffman.field3203[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = Huffman.field3203[var0][var1]; - var10000[1 + var2] |= 1170; - var10000 = Huffman.field3203[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = Huffman.field3203[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 1170; - var10000 = Huffman.field3203[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3416(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method4214(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field986[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class281.field3323[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class281.field3323[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class281.field3323[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class281.field3323[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3416(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method4208(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method4214(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field985[var4], 0, 0, 0, var19, var21); - } else { - long var23; - Object var25; - if (var5 == 5) { - var22 = 16; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var23) { - var22 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var23)).int2; - } - - 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); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field985[var4], 0, var22 * Tiles.field987[var4], var22 * Tiles.field988[var4], var19, var21); - } else if (var5 == 6) { - var22 = 8; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var23) { - var22 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var23)).int2 / 2; - } - - 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); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field980[var4], var22 * Tiles.field979[var4], var19, var21); - } else if (var5 == 7) { - var28 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); - } else if (var5 == 8) { - var22 = 8; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var23 != 0L) { - var22 = class245.getObjectDefinition(InterfaceParent.Entity_unpackID(var23)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - 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); - 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, var22 * Tiles.field980[var4], var22 * Tiles.field979[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - if (var29 != null && var6.method4208(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var28 = 15; - if (var29 instanceof Model) { - var28 = ((Model)var29).method4468() / 4; - if (var28 > 30) { - var28 = 30; - } - } - - for (int var31 = 0; var31 <= var9; ++var31) { - for (int var32 = 0; var32 <= var10; ++var32) { - if (var28 > class281.field3323[var0][var31 + var1][var32 + var2]) { - class281.field3323[var0][var31 + var1][var32 + var2] = (byte)var28; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } - } - - @ObfuscatedName("eh") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1000073039" + descriptor = "(I)[I", + garbageValue = "-1545852128" ) - static int method56() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; + public static int[] method57() { + int[] var0 = new int[KeyHandler.field110]; // L: 234 - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field521; - } else { - return 10000; + for (int var1 = 0; var1 < KeyHandler.field110; ++var1) { // L: 235 + var0[var1] = KeyHandler.field125[var1]; // L: 236 } + + return var0; // L: 238 } @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1977764791" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "77" ) - static final void method61(boolean var0) { - if (var0) { - Client.field519 = Login.field900 ? class112.field1358 : class112.field1362; - } else { - Client.field519 = WorldMapDecorationType.clientPreferences.parameters.containsKey(SoundCache.method771(Login.Login_username)) ? class112.field1363 : class112.field1359; + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 4155 + class408.clientPreferences.roofsHidden = !class408.clientPreferences.roofsHidden; // L: 4156 + Login.savePreferences(); // L: 4157 + if (class408.clientPreferences.roofsHidden) { // L: 4158 + class397.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + class397.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 4159 + } } - } + if (var0.equalsIgnoreCase("displayfps")) { // L: 4161 + Client.displayFps = !Client.displayFps; + } - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" - ) - static void method46() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } + if (var0.equalsIgnoreCase("renderself")) { // L: 4162 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 4163 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 4164 + if (var0.equalsIgnoreCase("errortest")) { // L: 4165 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 4166 + class133.worldMap.showCoord = !class133.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 4167 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 4168 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); // L: 4169 + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 4170 + Clock.method2960(); + } + } + + PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2721, Client.packetWriter.isaacCipher); // L: 4173 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 4174 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 4175 + Client.packetWriter.addNode(var1); // L: 4176 + } // L: 4177 } diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index a328a09e83..48c62cb986 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -1,54 +1,15 @@ -import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ca") public class class78 { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -2075053967 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("dh") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "(I)V", + garbageValue = "1498173559" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("fj") - static int[] field1016; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)[Lji;", - garbageValue = "-55" - ) - static GameBuild[] method2060() { - return new GameBuild[]{GameBuild.RC, GameBuild.LIVE, GameBuild.WIP, GameBuild.BUILDLIVE}; - } - - @ObfuscatedName("q") - static boolean method2061(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); - return var2 == 2; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-161476490" - ) - static String method2062() { - String var0 = ""; - - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { - var2 = (Message)var1.next(); - } - - return var0; - } + public static void method2078() { + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 218 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 219 + } // L: 220 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 5290d18895..6124f0c8c6 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("j") public class class8 { - @ObfuscatedName("l") - final int field33; - @ObfuscatedName("q") - final int field32; - @ObfuscatedName("f") - final String field34; + @ObfuscatedName("i") + final int field23; + @ObfuscatedName("w") + final int field24; + @ObfuscatedName("s") + final String field25; @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Lop;)V" ) class8(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); - } + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 + } // L: 20 class8(int var1, int var2, String var3) { - this.field33 = var1; - this.field32 = var2; - this.field34 = var3; + this.field23 = var1; // L: 13 + this.field24 = var2; // L: 14 + this.field25 = var3; // L: 15 + } // L: 16 + + @ObfuscatedName("i") + String method60() { + return Integer.toHexString(this.field23) + Integer.toHexString(this.field24) + this.field25; // L: 23 } - @ObfuscatedName("l") - String method67() { - return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field34; - } - - @ObfuscatedName("q") - int method68() { - return this.field32; + @ObfuscatedName("w") + int method64() { + return this.field24; // L: 27 } } diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java index a333f93c5e..12396802a3 100644 --- a/runescape-client/src/main/java/class87.java +++ b/runescape-client/src/main/java/class87.java @@ -1,771 +1,106 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cl") public class class87 { - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lfa;", - garbageValue = "284791287" + descriptor = "([BI)Lbp;", + garbageValue = "-530191706" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = UserComparator4.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @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 + int var7; + int var8; + if (var6 > 0) { // L: 124 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 125 - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { - var1.groundActions[var3] = null; - } - - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { - if (var3 != 4) { - var1.inventoryActions[var3] = null; - } - } - - 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()) { - ParamComposition var5 = class126.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var6 = true; - } - } - - if (!var6) { - var1.params = null; - } - } - } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lay;Llt;I)V", - garbageValue = "-654214919" - ) - static void method2196(GameEngine var0, Font var1) { - if (Login.worldSelectOpen) { - Decimator.method1014(var0); - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - WorldMapDecorationType.clientPreferences.titleMusicDisabled = !WorldMapDecorationType.clientPreferences.titleMusicDisabled; - ScriptFrame.savePreferences(); - if (!WorldMapDecorationType.clientPreferences.titleMusicDisabled) { - Archive var2 = Tiles.archive6; - int var3 = var2.getGroupId("scape main"); - int var4 = var2.getFileId(var3, ""); - class67.method1886(var2, var3, var4, 255, false); + for (var7 = 0; var7 < var6; ++var7) { // L: 126 + var8 = var2.readUnsignedShort(); // L: 127 + int var9; + int var11; + if (var8 > 0) { // L: 129 + var11 = var8 - 1; // L: 133 + var11 |= var11 >>> 1; // L: 134 + var11 |= var11 >>> 2; // L: 135 + var11 |= var11 >>> 4; // L: 136 + var11 |= var11 >>> 8; // L: 137 + var11 |= var11 >>> 16; // L: 138 + int var10 = var11 + 1; // L: 139 + var9 = var10; // L: 141 } else { - class247.midiPcmStream.clear(); - class247.musicPlayerStatus = 1; - class113.musicTrackArchive = null; - } - } - - if (Client.gameState != 5) { - if (Login.field885 == -1L) { - Login.field885 = UserComparator4.method2406() + 1000L; + var9 = 1; // L: 143 } - long var22 = UserComparator4.method2406(); - boolean var32; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { - var32 = true; - break; - } - - ArchiveLoader var5 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var5.isLoaded()) { - var32 = false; - break; - } - - ++Client.archiveLoadersDone; - } - } else { - var32 = true; - } - - if (var32 && -1L == Login.field905) { - Login.field905 = var22; - if (Login.field905 > Login.field885) { - Login.field885 = Login.field905; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - int var24; - if (ReflectionCheck.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var24 = Login.xPadding + 5; - short var6 = 463; - byte var7 = 100; - byte var8 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var24 && MouseHandler.MouseHandler_lastPressedX <= var7 + var24 && MouseHandler.MouseHandler_lastPressedY >= var6 && MouseHandler.MouseHandler_lastPressedY <= var6 + var8) { - class6.method44(); - return; - } - } - - if (class4.World_request != null) { - class6.method44(); - } - } - - var24 = MouseHandler.MouseHandler_lastButton; - int var33 = MouseHandler.MouseHandler_lastPressedX; - int var34 = MouseHandler.MouseHandler_lastPressedY; - if (var24 == 0) { - var33 = MouseHandler.MouseHandler_x; - var34 = MouseHandler.MouseHandler_y; - } - - if (!VarbitComposition.mouseCam && var24 == 4) { - var24 = 1; - } - - short var39; - int var40; - if (Login.loginIndex == 0) { - boolean var42 = false; - - while (CollisionMap.isKeyDown()) { - if (class4.field13 == 84) { - var42 = true; - } - } - - var40 = class78.loginBoxCenter - 80; - var39 = 291; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20) { - LoginScreenAnimation.openURL(HitSplatDefinition.method3168("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var40 = class78.loginBoxCenter + 80; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20 || var42) { - 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 = ""; - class112.method2474(1); - class14.method175(); - } else if ((Client.worldProperties & 4) != 0) { - if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - class112.method2474(1); - class14.method175(); - } 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!"; - class112.method2474(1); - class14.method175(); - } else { - class20.Login_promptCredentials(false); - } - } - } else { - short var9; - int var35; - if (Login.loginIndex == 1) { - while (true) { - if (!CollisionMap.isKeyDown()) { - var35 = class78.loginBoxCenter - 80; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class20.Login_promptCredentials(false); - } - - var35 = class78.loginBoxCenter + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class112.method2474(0); - } - break; - } - - if (class4.field13 == 84) { - class20.Login_promptCredentials(false); - } else if (class4.field13 == 13) { - class112.method2474(0); - } - } - } else { - short var36; - if (Login.loginIndex == 2) { - var36 = 201; - var35 = var36 + 52; - if (var24 == 1 && var34 >= var35 - 12 && var34 < var35 + 2) { - Login.currentLoginField = 0; - } - - var35 += 15; - if (var24 == 1 && var34 >= var35 - 12 && var34 < var35 + 2) { - Login.currentLoginField = 1; - } - - var35 += 15; - var36 = 361; - if (Ignored.field3969 != null) { - var40 = Ignored.field3969.highX / 2; - if (var24 == 1 && var33 >= Ignored.field3969.lowX - var40 && var33 <= var40 + Ignored.field3969.lowX && var34 >= var36 - 15 && var34 < var36) { - switch(Login.field869) { - case 1: - class17.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - class112.method2474(5); - return; - case 2: - LoginScreenAnimation.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var40 = class78.loginBoxCenter - 80; - var39 = 321; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class17.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class17.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class17.setLoginResponseString("", "Connecting to server...", ""); - class7.method61(false); - UserList.updateGameState(20); - return; - } - - var40 = Login.loginBoxX + 180 + 80; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20) { - class112.method2474(0); - Login.Login_username = ""; - Login.Login_password = ""; - MouseHandler.field236 = 0; - Ignored.otp = ""; - Login.field900 = true; - } - - var40 = class78.loginBoxCenter + -117; - var39 = 277; - Login.field904 = var33 >= var40 && var33 < var40 + GrandExchangeOfferTotalQuantityComparator.field3741 && var34 >= var39 && var34 < var39 + class20.field103; - if (var24 == 1 && Login.field904) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && WorldMapDecorationType.clientPreferences.rememberedUsername != null) { - WorldMapDecorationType.clientPreferences.rememberedUsername = null; - ScriptFrame.savePreferences(); - } - } - - var40 = class78.loginBoxCenter + 24; - var39 = 277; - Login.field895 = var33 >= var40 && var33 < var40 + GrandExchangeOfferTotalQuantityComparator.field3741 && var34 >= var39 && var34 < var39 + class20.field103; - if (var24 == 1 && Login.field895) { - WorldMapDecorationType.clientPreferences.hideUsername = !WorldMapDecorationType.clientPreferences.hideUsername; - if (!WorldMapDecorationType.clientPreferences.hideUsername) { - Login.Login_username = ""; - WorldMapDecorationType.clientPreferences.rememberedUsername = null; - class14.method175(); - } - - ScriptFrame.savePreferences(); - } - - while (true) { - int var13; - Transferable var41; - do { - while (true) { - label1042: - do { - while (true) { - while (CollisionMap.isKeyDown()) { - if (class4.field13 != 13) { - if (Login.currentLoginField != 0) { - continue label1042; - } - - FileSystem.method2820(Skeleton.field2376); - if (class4.field13 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class4.field13 == 84 || class4.field13 == 80) { - Login.currentLoginField = 1; - } - - if (WorldMapIcon_1.method3461(Skeleton.field2376) && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Skeleton.field2376; - } - } else { - class112.method2474(0); - Login.Login_username = ""; - Login.Login_password = ""; - MouseHandler.field236 = 0; - Ignored.otp = ""; - Login.field900 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (class4.field13 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (class4.field13 == 84 || class4.field13 == 80) { - Login.currentLoginField = 0; - if (class4.field13 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class17.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class17.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class17.setLoginResponseString("", "Connecting to server...", ""); - class7.method61(false); - UserList.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class4.field13 == 67) { - Clipboard var38 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var41 = var38.getContents(class21.client); - var13 = 20 - Login.Login_password.length(); - break; - } - - if (ParamComposition.method3128(Skeleton.field2376) && WorldMapIcon_1.method3461(Skeleton.field2376) && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + Skeleton.field2376; - } - } - } while(var13 <= 0); - - try { - String var14 = (String)var41.getTransferData(DataFlavor.stringFlavor); - int var15 = Math.min(var13, var14.length()); - - for (int var16 = 0; var16 < var15; ++var16) { - char var18 = var14.charAt(var16); - boolean var17; - if (var18 >= ' ' && var18 < 127 || var18 > 127 && var18 < 160 || var18 > 160 && var18 <= 255) { - var17 = true; - } else { - label1235: { - if (var18 != 0) { - char[] var19 = class316.cp1252AsciiExtension; - - for (int var20 = 0; var20 < var19.length; ++var20) { - char var21 = var19[var20]; - if (var18 == var21) { - var17 = true; - break label1235; - } - } - } - - var17 = false; - } - } - - if (!var17 || !WorldMapIcon_1.method3461(var14.charAt(var16))) { - class112.method2474(3); - return; - } - } - - Login.Login_password = Login.Login_password + var14.substring(0, var15); - } catch (UnsupportedFlavorException var30) { - } catch (IOException var31) { - } - } - } else { - byte var10; - if (Login.loginIndex == 3) { - var35 = Login.loginBoxX + 180; - var9 = 276; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - if (class21.client.method1338()) { - var10 = 10; - } else { - var10 = 0; - } - - class112.method2474(var10); - Login.method1930(); - class14.method175(); - } - - var35 = Login.loginBoxX + 180; - var9 = 326; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class17.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - class112.method2474(5); - return; - } - } else { - int var25; - if (Login.loginIndex == 4) { - var35 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - Ignored.otp.trim(); - if (Ignored.otp.length() != 6) { - class17.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - MouseHandler.field236 = Integer.parseInt(Ignored.otp); - Ignored.otp = ""; - class7.method61(true); - class17.setLoginResponseString("", "Connecting to server...", ""); - UserList.updateGameState(20); - return; - } - - if (var24 == 1 && var33 >= Login.loginBoxX + 180 - 9 && var33 <= Login.loginBoxX + 180 + 130 && var34 >= 263 && var34 <= 296) { - Login.field900 = !Login.field900; - } - - if (var24 == 1 && var33 >= Login.loginBoxX + 180 - 34 && var33 <= Login.loginBoxX + 34 + 180 && var34 >= 351 && var34 <= 363) { - LoginScreenAnimation.openURL(HitSplatDefinition.method3168("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var35 = Login.loginBoxX + 180 + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class112.method2474(0); - Login.Login_username = ""; - Login.Login_password = ""; - MouseHandler.field236 = 0; - Ignored.otp = ""; - } - - while (CollisionMap.isKeyDown()) { - boolean var37 = false; - - for (var25 = 0; var25 < "1234567890".length(); ++var25) { - if (Skeleton.field2376 == "1234567890".charAt(var25)) { - var37 = true; - break; - } - } - - if (class4.field13 == 13) { - class112.method2474(0); - Login.Login_username = ""; - Login.Login_password = ""; - MouseHandler.field236 = 0; - Ignored.otp = ""; - } else { - if (class4.field13 == 85 && Ignored.otp.length() > 0) { - Ignored.otp = Ignored.otp.substring(0, Ignored.otp.length() - 1); - } - - if (class4.field13 == 84) { - Ignored.otp.trim(); - if (Ignored.otp.length() != 6) { - class17.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - MouseHandler.field236 = Integer.parseInt(Ignored.otp); - Ignored.otp = ""; - class7.method61(true); - class17.setLoginResponseString("", "Connecting to server...", ""); - UserList.updateGameState(20); - return; - } - - if (var37 && Ignored.otp.length() < 6) { - Ignored.otp = Ignored.otp + Skeleton.field2376; - } - } - } - } else if (Login.loginIndex == 5) { - var35 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class1.method14(); - return; - } - - var35 = Login.loginBoxX + 180 + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class20.Login_promptCredentials(true); - } - - var39 = 361; - if (class13.field76 != null) { - var25 = class13.field76.highX / 2; - if (var24 == 1 && var33 >= class13.field76.lowX - var25 && var33 <= var25 + class13.field76.lowX && var34 >= var39 - 15 && var34 < var39) { - LoginScreenAnimation.openURL(HitSplatDefinition.method3168("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (CollisionMap.isKeyDown()) { - boolean var43 = false; - - for (int var26 = 0; var26 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var26) { - if (Skeleton.field2376 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var26)) { - var43 = true; - break; - } - } - - if (class4.field13 == 13) { - class20.Login_promptCredentials(true); - } else { - if (class4.field13 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class4.field13 == 84) { - class1.method14(); - return; - } - - if (var43 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Skeleton.field2376; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var35 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - LoginScreenAnimation.openURL(HitSplatDefinition.method3168("secure", true) + "m=dob/set_dob.ws", true, false); - class17.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - class112.method2474(6); - return; - } - - var35 = Login.loginBoxX + 180 + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class20.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var35 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - LoginScreenAnimation.openURL("https://www.jagex.com/terms/privacy", true, false); - class17.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - class112.method2474(6); - return; - } - - var35 = Login.loginBoxX + 180 + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - class20.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 9) { - var35 = Login.loginBoxX + 180; - var9 = 311; - if (class4.field13 == 84 || class4.field13 == 13 || var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - if (class21.client.method1338()) { - var10 = 10; - } else { - var10 = 0; - } - - class112.method2474(var10); - Login.method1930(); - class14.method175(); - } - } else if (Login.loginIndex == 10) { - var35 = Login.loginBoxX + 180; - var9 = 209; - if (class4.field13 == 84 || var24 == 1 && var33 >= var35 - 109 && var33 <= var35 + 109 && var34 >= var9 && var34 <= var9 + 68) { - class17.setLoginResponseString("", "Connecting to server...", ""); - Client.field520 = class404.field4348; - class7.method61(false); - UserList.updateGameState(20); - } - } else if (Login.loginIndex == 12) { - var35 = class78.loginBoxCenter; - var9 = 233; - Bounds var27 = var1.method5693(0, 30, "terms of use, privacy policy, and end user licence", var35, var9); - Bounds var11 = var1.method5693(32, 32, "terms of use, privacy policy, and end user licence", var35, var9); - Bounds var12 = var1.method5693(70, 34, "terms of use, privacy policy, and end user licence", var35, var9); - var40 = var9 + 17; - Bounds var28 = var1.method5693(0, 34, "agreement (EULA).", var35, var40); - if (var24 == 1) { - if (var27.method6252(var33, var34)) { - LoginScreenAnimation.openURL("https://www.jagex.com/terms", true, false); - } else if (var11.method6252(var33, var34)) { - LoginScreenAnimation.openURL("https://www.jagex.com/terms/privacy", true, false); - } else if (var12.method6252(var33, var34) || var28.method6252(var33, var34)) { - LoginScreenAnimation.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); - } - } - - var35 = class78.loginBoxCenter - 80; - var9 = 311; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - KitDefinition.method2953(); - if (!class12.method159()) { - Login.loginIndex = 12; - } else { - Login.loginIndex = 0; - } - } - - var35 = class78.loginBoxCenter + 80; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - Login.loginIndex = 13; - } - } else if (Login.loginIndex == 13) { - var35 = class78.loginBoxCenter; - var9 = 321; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - if (!class12.method159()) { - Login.loginIndex = 12; - } else { - Login.loginIndex = 0; - } - } - } else if (Login.loginIndex == 14) { - String var29 = ""; - switch(Login.field884) { - case 0: - var29 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var29 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - class20.Login_promptCredentials(false); - } - - var40 = Login.loginBoxX + 180; - var39 = 276; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20) { - LoginScreenAnimation.openURL(var29, true, false); - class17.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - class112.method2474(6); - return; - } - - var40 = Login.loginBoxX + 180; - var39 = 326; - if (var24 == 1 && var33 >= var40 - 75 && var33 <= var40 + 75 && var34 >= var39 - 20 && var34 <= var39 + 20) { - class20.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var35 = Login.loginBoxX + 180; - var9 = 301; - if (var24 == 1 && var33 >= var35 - 75 && var33 <= var35 + 75 && var34 >= var9 - 20 && var34 <= var9 + 20) { - if (class21.client.method1338()) { - var10 = 10; - } else { - var10 = 0; - } - - class112.method2474(var10); - Login.method1930(); - class14.method175(); - } - } - } else { - while (true) { - do { - if (!CollisionMap.isKeyDown()) { - var36 = 321; - if (var24 == 1 && var34 >= var36 - 20 && var34 <= var36 + 20) { - class20.Login_promptCredentials(true); - } - - return; - } - } while(class4.field13 != 84 && class4.field13 != 13); - - class20.Login_promptCredentials(true); - } - } - } - } - } - } + IterableNodeHashTable var13 = new IterableNodeHashTable(var9); // L: 144 + var1.switches[var7] = var13; // L: 145 + while (var8-- > 0) { // L: 146 + var11 = var2.readInt(); // L: 147 + int var12 = var2.readInt(); // L: 148 + var13.put(new IntegerNode(var12), (long)var11); // L: 149 } } } + + var2.offset = 0; // L: 153 + var1.field928 = var2.readStringCp1252NullTerminatedOrNull(); // L: 154 + var1.opcodes = new int[var5]; // L: 155 + var1.intOperands = new int[var5]; // L: 156 + var1.stringOperands = new String[var5]; // L: 157 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 158 159 164 + var8 = var2.readUnsignedShort(); // L: 160 + if (var8 == 3) { // L: 161 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 162 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 163 + } + } + + return var1; // L: 166 } - @ObfuscatedName("je") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "37" + descriptor = "(B)V", + garbageValue = "-45" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var0)) { - NetSocket.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + public static void method2223() { + KitDefinition.KitDefinition_cached.clear(); // L: 130 + } // L: 131 + + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-278376430" + ) + static int method2224() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1993 + int var0 = 0; // L: 1994 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1995 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1996 + } + + return var0 * 10000 / Client.field745; // L: 1998 + } else { + return 10000; } } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 0bc6df368b..9be7baac3f 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -3,213 +3,179 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("b") public class class9 implements MouseWheel { - @ObfuscatedName("sh") - @ObfuscatedGetter( - intValue = 2032857847 + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lb;" ) - static int field44; + static final class9 field31; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lb;" + ) + public static final class9 field27; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lb;" + ) + static final class9 field28; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lb;" + ) + static final class9 field29; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lb;" + ) + static final class9 field30; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Li;" + descriptor = "Loe;" ) - static final class9 field46; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Li;" - ) - public static final class9 field43; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Li;" - ) - static final class9 field42; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Li;" - ) - static final class9 field38; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Li;" - ) - static final class9 field39; - @ObfuscatedName("k") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -517250407 + intValue = 1141093005 ) - int field40; - @ObfuscatedName("t") - String field41; - @ObfuscatedName("a") - boolean field35; + int field33; @ObfuscatedName("e") - boolean field36; + String field32; + @ObfuscatedName("p") + boolean field37; + @ObfuscatedName("j") + boolean field34; static { - field46 = new class9(0, "POST", true, true); - field43 = new class9(1, "GET", true, false); - field42 = new class9(2, "PUT", false, true); - field38 = new class9(3, "PATCH", false, true); - field39 = new class9(4, "DELETE", false, true); + field31 = new class9(0, "POST", true, true); // L: 6 + field27 = new class9(1, "GET", true, false); // L: 7 + field28 = new class9(2, "PUT", false, true); // L: 8 + field29 = new class9(3, "PATCH", false, true); // L: 9 + field30 = new class9(4, "DELETE", false, true); // L: 10 } class9(int var1, String var2, boolean var3, boolean var4) { - this.field40 = var1; - this.field41 = var2; - this.field35 = var3; - this.field36 = var4; + this.field33 = var1; // L: 17 + this.field32 = var2; // L: 18 + this.field37 = var3; // L: 19 + this.field34 = var4; // L: 20 + } // L: 21 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "488070367" + ) + boolean method76() { + return this.field37; // L: 24 } - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "661199397" + garbageValue = "238732485" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field40; + return this.field33; // L: 36 } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1505605865" - ) - boolean method74() { - return this.field35; - } - - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-989360372" + garbageValue = "1536909535" ) - String method85() { - return this.field41; + String method78() { + return this.field32; // L: 28 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "4" + ) + boolean method70() { + return this.field34; // L: 32 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BIIB)Z", + garbageValue = "6" + ) + static final boolean method69(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 218 + Buffer var4 = new Buffer(var0); // L: 219 + int var5 = -1; // L: 220 + + label71: + while (true) { + int var6 = var4.method6981(); // L: 222 + if (var6 == 0) { // L: 223 + return var3; // L: 254 + } + + var5 += var6; // L: 224 + int var7 = 0; // L: 225 + boolean var8 = false; // L: 226 + + while (true) { + int var9; + while (!var8) { // L: 228 + var9 = var4.readUShortSmart(); // L: 234 + if (var9 == 0) { // L: 235 + continue label71; + } + + var7 += var9 - 1; // L: 236 + int var10 = var7 & 63; // L: 237 + int var11 = var7 >> 6 & 63; // L: 238 + int var12 = var4.readUnsignedByte() >> 2; // L: 239 + int var13 = var11 + var1; // L: 240 + int var14 = var10 + var2; // L: 241 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 242 + ObjectComposition var15 = KitDefinition.getObjectDefinition(var5); // L: 243 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 244 + if (!var15.needsModelFiles()) { // L: 245 + ++Client.field523; // L: 246 + var3 = false; // L: 247 + } + + var8 = true; // L: 249 + } + } + } + + var9 = var4.readUShortSmart(); // L: 229 + if (var9 == 0) { // L: 230 + break; + } + + var4.readUnsignedByte(); // L: 231 + } + } } @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-83" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "435591094" ) - boolean method76() { - return this.field36; - } + static final void method82(String var0) { + PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2752, Client.packetWriter.isaacCipher); // L: 181 + var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 182 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 183 + Client.packetWriter.addNode(var1); // L: 184 + } // L: 185 - @ObfuscatedName("jq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "([Ljt;IB)V", - garbageValue = "1" + descriptor = "(IB)I", + garbageValue = "-79" ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !ObjectSound.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && ObjectSound.isComponentHidden(var3) && var3 != VarpDefinition.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (GrandExchangeOfferTotalQuantityComparator.loadInterface(var5)) { - drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); - } - } - } - - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = BufferedNetSocket.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = KitDefinition.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field536; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class16.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field3038 != 0 && !var3.isIf3) { - int var8 = var3.field3038 >> 16; - var5 = var3.field3038 << 16 >> 16; - var8 *= Client.field536; - var5 *= Client.field536; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - class16.invalidateWidget(var3); - } - } - } - } - - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(Ljt;B)V", - garbageValue = "109" - ) - static final void method87(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field758 == -1) { - Client.field758 = var0.spriteId2; - Client.field759 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field758; - } else { - var0.spriteId2 = Client.field759; - } - - } else if (var1 == 325) { - if (Client.field758 == -1) { - Client.field758 = var0.spriteId2; - Client.field759 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field759; - } else { - var0.spriteId2 = Client.field758; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; - } + static int method83(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3630 } } diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java index a10353beea..fefe472646 100644 --- a/runescape-client/src/main/java/class91.java +++ b/runescape-client/src/main/java/class91.java @@ -1,23 +1,138 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ce") +@ObfuscatedName("cg") public class class91 { - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lps;" + descriptor = "(Ljava/lang/String;ZZB)V", + garbageValue = "21" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 28 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 29 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 31 + return; // L: 52 + } catch (Exception var4) { // L: 34 + } + } + + if (class29.field158.startsWith("win")) { // L: 36 + Message.method1143(var0, 0); // L: 38 + } else if (class29.field158.startsWith("mac")) { // L: 42 + Occluder.method4485(var0, 1, "openjs"); // L: 43 + } else { + Message.method1143(var0, 2); // L: 46 + } } else { - var2 = new RunException(var0, var1); + Message.method1143(var0, 3); // L: 49 } - return var2; } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)Lbw;", + garbageValue = "-50" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? WorldMapEvent.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbp;ZI)I", + garbageValue = "-1496971599" + ) + static int method2271(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3536 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class134.getWindowedMode(); // L: 3537 + return 1; // L: 3538 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3540 + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3541 + if (var3 == 1 || var3 == 2) { // L: 3542 + HorizontalAlignment.setWindowedMode(var3); + } + + return 1; // L: 3543 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3545 + Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.windowMode; // L: 3546 + return 1; // L: 3547 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3549 + if (var0 == 5310) { // L: 3557 + --class14.Interpreter_intStackSize; // L: 3558 + return 1; // L: 3559 + } else if (var0 == 5311) { // L: 3561 + class14.Interpreter_intStackSize -= 2; // L: 3562 + return 1; // L: 3563 + } else if (var0 == 5312) { // L: 3565 + --class14.Interpreter_intStackSize; // L: 3566 + return 1; // L: 3567 + } else if (var0 == 5350) { // L: 3569 + class295.Interpreter_stringStackSize -= 2; // L: 3570 + --class14.Interpreter_intStackSize; // L: 3571 + return 1; // L: 3572 + } else if (var0 == 5351) { // L: 3574 + --class295.Interpreter_stringStackSize; // L: 3575 + return 1; // L: 3576 + } else { + return 2; // L: 3578 + } + } else { + var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3550 + if (var3 == 1 || var3 == 2) { // L: 3551 + class408.clientPreferences.windowMode = var3; // L: 3552 + Login.savePreferences(); // L: 3553 + } + + return 1; // L: 3555 + } + } + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1813589022" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4639 + byte var2 = 4; // L: 4640 + int var3 = var2 + 6; // L: 4641 + int var4 = var2 + 6; // L: 4642 + int var5 = class6.fontPlain12.lineWidth(var0, 250); // L: 4643 + int var6 = class6.fontPlain12.lineCount(var0, 250) * 13; // L: 4644 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0); // L: 4645 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); // L: 4646 + class6.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4647 + int var7 = var3 - var2; // L: 4648 + int var8 = var4 - var2; // L: 4649 + int var9 = var2 + var5 + var2; // L: 4650 + int var10 = var2 + var2 + var6; // L: 4651 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4653 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { // L: 4654 + Client.field594[var11] = true; + } + } + + if (var1) { // L: 4657 + Canvas.rasterProvider.drawFull(0, 0); // L: 4658 + } else { + Language.method5516(var3, var4, var5, var6); // L: 4661 + } + + } + } // L: 4663 } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index faf6426dbb..dfb01ce2dd 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -3,331 +3,482 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cw") public class class92 { - @ObfuscatedName("x") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1651318617 + intValue = 1870975217 ) - int field1228; - @ObfuscatedName("q") + int field1221; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 721059991 + intValue = -495972343 ) - int field1227; - @ObfuscatedName("f") + int field1225; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1547697199 + intValue = -291445799 ) - int field1229; - @ObfuscatedName("j") + int field1222; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -930814481 + intValue = 1837112375 ) - int field1230; + int field1223; class92(int var1, int var2, int var3, int var4) { - this.field1228 = var1; - this.field1227 = var2; - this.field1229 = var3; - this.field1230 = var4; - } + this.field1221 = var1; // L: 10 + this.field1225 = var2; // L: 11 + this.field1222 = var3; // L: 12 + this.field1223 = var4; // L: 13 + } // L: 14 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1995128914" - ) - int method2243() { - return this.field1228; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1437563036" - ) - int method2254() { - return this.field1227; - } - - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-1" + garbageValue = "-86" ) - int method2242() { - return this.field1229; + int method2277() { + return this.field1221; // L: 17 } - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "201682335" + garbageValue = "505053484" ) - int method2245() { - return this.field1230; + int method2279() { + return this.field1225; // L: 21 } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Loy;II)V", - garbageValue = "767039903" + descriptor = "(I)I", + garbageValue = "-72606993" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } + int method2278() { + return this.field1222; // L: 25 + } - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field1060 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (WorldMapSectionType.baseX + var4.pathX[0] >> 13 << 14) + (PlayerComposition.baseY + var4.pathY[0] >> 13); - if (var4.field1134 != -1) { - Players.Players_orientations[var1] = var4.field1134; - } else { - Players.Players_orientations[var1] = var4.orientation; - } + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-421666283" + ) + int method2281() { + return this.field1223; // L: 29 + } - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - ChatChannel.updateExternalPlayer(var0, var1); - } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Lib;", + garbageValue = "1939473389" + ) + public static PacketBufferNode method2296() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIIILhf;Lfq;B)V", + garbageValue = "1" + ) + static final void method2276(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: 289 290 291 + if (var0 < Tiles.Tiles_minPlane) { // L: 294 + Tiles.Tiles_minPlane = var0; } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field1060 = false; - } else if (var2) { - var4.field1060 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1060 = false; - var4.method2092(var6, var7, Players.field1245[var1]); - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field1060 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1060 = false; - var4.method2092(var6, var7, Players.field1245[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.field1060 = false; - } + ObjectComposition var8 = KitDefinition.getObjectDefinition(var3); // L: 295 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 298 + var9 = var8.sizeX; // L: 303 + var10 = var8.sizeY; // L: 304 } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; + var9 = var8.sizeY; // L: 299 + var10 = var8.sizeX; // L: 300 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 310 + var11 = (var9 >> 1) + var1; // L: 311 + var12 = (var9 + 1 >> 1) + var1; // L: 312 + } else { + var11 = var1; // L: 315 + var12 = var1 + 1; // L: 316 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 318 + var13 = (var10 >> 1) + var2; // L: 319 + var14 = var2 + (var10 + 1 >> 1); // L: 320 + } else { + var13 = var2; // L: 323 + var14 = var2 + 1; // L: 324 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 326 + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 327 + int var17 = (var1 << 7) + (var9 << 6); // L: 328 + int var18 = (var2 << 7) + (var10 << 6); // L: 329 + long var19 = PacketBuffer.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 330 + int var21 = var5 + (var4 << 6); // L: 331 + if (var8.int3 == 1) { // L: 332 + var21 += 256; + } + + if (var8.hasSound()) { // L: 333 + class125.method2635(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { // L: 334 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 335 + if (var8.animationId == -1 && var8.transforms == null) { // L: 337 + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 338 } - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 339 + if (var8.interactType == 1 && var7 != null) { // L: 340 + var7.setBlockedByFloorDec(var1, var2); } - 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.field1060 = true; - var4.tileX = var10; - var4.tileY = var11; + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { // L: 343 + int[] var10000; + if (var5 >= 12) { // L: 364 + if (var8.animationId == -1 && var8.transforms == null) { // L: 366 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); } else { - var4.field1060 = false; - var4.method2092(var10, var11, Players.field1245[var1]); + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 367 } + + var6.method4289(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 368 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 369 + var10000 = Tiles.field962[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 370 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 373 + if (var8.animationId == -1 && var8.transforms == null) { // L: 375 + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 376 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field964[var4], 0, var19, var21); // L: 377 + if (var4 == 0) { // L: 378 + if (var8.clipped) { // L: 379 + class54.field419[var0][var1][var2] = 50; // L: 380 + class54.field419[var0][var1][var2 + 1] = 50; // L: 381 + } + + if (var8.modelClipped) { // L: 383 + var10000 = Tiles.field962[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 385 + if (var8.clipped) { // L: 386 + class54.field419[var0][var1][var2 + 1] = 50; // L: 387 + class54.field419[var0][var1 + 1][var2 + 1] = 50; // L: 388 + } + + if (var8.modelClipped) { // L: 390 + var10000 = Tiles.field962[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { // L: 392 + if (var8.clipped) { // L: 393 + class54.field419[var0][var1 + 1][var2] = 50; // L: 394 + class54.field419[var0][var1 + 1][var2 + 1] = 50; // L: 395 + } + + if (var8.modelClipped) { // L: 397 + var10000 = Tiles.field962[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 399 + if (var8.clipped) { // L: 400 + class54.field419[var0][var1][var2] = 50; // L: 401 + class54.field419[var0][var1 + 1][var2] = 50; // L: 402 + } + + if (var8.modelClipped) { // L: 404 + var10000 = Tiles.field962[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 406 + var7.method3465(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 407 + var6.method4387(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 410 + if (var8.animationId == -1 && var8.transforms == null) { // L: 412 + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 413 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field967[var4], 0, var19, var21); // L: 414 + if (var8.clipped) { // L: 415 + if (var4 == 0) { // L: 416 + class54.field419[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 417 + class54.field419[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 418 + class54.field419[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 419 + class54.field419[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 421 + var7.method3465(var1, var2, var5, var4, var8.boolean1); + } + } else { - var4.resetPath(var10, var11); - var4.field1060 = false; - } + int var22; + if (var5 == 2) { // L: 424 + var22 = var4 + 1 & 3; // L: 425 + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { // L: 428 + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 429 + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 430 + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 433 + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 434 + } - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - VertexNormal.Client_plane = var4.plane; - } + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field964[var4], Tiles.field964[var22], var19, var21); // L: 436 + if (var8.modelClipped) { // L: 437 + if (var4 == 0) { // L: 438 + var10000 = Tiles.field962[var0][var1]; // L: 439 + var10000[var2] |= 585; + var10000 = Tiles.field962[var0][var1]; // L: 440 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 442 + var10000 = Tiles.field962[var0][var1]; // L: 443 + var10000[1 + var2] |= 1170; + var10000 = Tiles.field962[var0][var1 + 1]; // L: 444 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 446 + var10000 = Tiles.field962[var0][var1 + 1]; // L: 447 + var10000[var2] |= 585; + var10000 = Tiles.field962[var0][var1]; // L: 448 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 450 + var10000 = Tiles.field962[var0][var1]; // L: 451 + var10000[var2] |= 1170; + var10000 = Tiles.field962[var0][var1]; // L: 452 + var10000[var2] |= 585; + } + } + if (var8.interactType != 0 && var7 != null) { // L: 455 + var7.method3465(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 456 + var6.method4387(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 459 + if (var8.animationId == -1 && var8.transforms == null) { // L: 461 + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 462 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field967[var4], 0, var19, var21); // L: 463 + if (var8.clipped) { // L: 464 + if (var4 == 0) { // L: 465 + class54.field419[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 466 + class54.field419[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 467 + class54.field419[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 468 + class54.field419[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 470 + var7.method3465(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 473 + if (var8.animationId == -1 && var8.transforms == null) { // L: 475 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 476 + } + + var6.method4289(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 477 + if (var8.interactType != 0 && var7 != null) { // L: 478 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 479 + var6.method4387(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 482 + if (var8.animationId == -1 && var8.transforms == null) { // L: 484 + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 485 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field964[var4], 0, 0, 0, var19, var21); // L: 486 + } else { + long var23; + Object var25; + if (var5 == 5) { // L: 489 + var22 = 16; // L: 490 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 491 + if (var23 != 0L) { // L: 492 + var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 494 + 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: 495 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field964[var4], 0, var22 * Tiles.field966[var4], var22 * Tiles.field960[var4], var19, var21); // L: 496 + } else if (var5 == 6) { // L: 499 + var22 = 8; // L: 500 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 501 + if (var23 != 0L) { // L: 502 + var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 504 + 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: 505 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field957[var4], var22 * Tiles.field970[var4], var19, var21); // L: 506 + } else if (var5 == 7) { // L: 509 + var28 = var4 + 2 & 3; // L: 511 + if (var8.animationId == -1 && var8.transforms == null) { // L: 512 + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 513 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 514 + } else if (var5 == 8) { // L: 517 + var22 = 8; // L: 518 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 519 + if (var23 != 0L) { // L: 520 + var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 523 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 524 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 525 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 526 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 529 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 530 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field957[var4], var22 * Tiles.field970[var4], var19, var21); // L: 532 + } + } + } } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + WorldMapSectionType.baseX + var4.pathX[0] & 16383) - WorldMapSectionType.baseX; - var11 = (var9 + PlayerComposition.baseY + var4.pathY[0] & 16383) - PlayerComposition.baseY; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field1060 = false; - } else if (var2) { - var4.field1060 = true; - var4.tileX = var10; - var4.tileY = var11; + if (var8.animationId == -1 && var8.transforms == null) { // L: 345 + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); } else { - var4.field1060 = false; - var4.method2092(var10, var11, Players.field1245[var1]); + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 346 } - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - VertexNormal.Client_plane = var4.plane; + if (var29 != null && var6.method4289(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 347 348 + var28 = 15; // L: 349 + if (var29 instanceof Model) { // L: 350 + var28 = ((Model)var29).method4536() / 4; // L: 351 + if (var28 > 30) { // L: 352 + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { // L: 354 + for (int var32 = 0; var32 <= var10; ++var32) { // L: 355 + if (var28 > class54.field419[var0][var31 + var1][var32 + var2]) { // L: 356 + class54.field419[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 361 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); } } } } - } + } // L: 341 362 371 408 422 457 471 480 487 497 507 515 533 535 - @ObfuscatedName("fa") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(Ljt;III)V", - garbageValue = "1622114709" + descriptor = "(III)V", + garbageValue = "501467112" ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !VarbitComposition.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var5 * var7 + var4 * var8 >> 11; - int var10 = var5 * var8 - var7 * var4 >> 11; - int var11 = var9 + class67.localPlayer.x >> 7; - int var12 = class67.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = LoginScreenAnimation.getPacketBufferNode(ClientPacket.field2745, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method7029(var11 + WorldMapSectionType.baseX); - var13.packetBuffer.method6931(var12 + PlayerComposition.baseY); - var13.packetBuffer.method7117(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(class67.localPlayer.x); - var13.packetBuffer.writeShort(class67.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2761, Client.packetWriter.isaacCipher); // L: 9149 + var2.packetBuffer.method7010(var0); // L: 9150 + var2.packetBuffer.writeShort(var1); // L: 9151 + Client.packetWriter.addNode(var2); // L: 9152 + } // L: 9153 + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "2117649416" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + GameEngine.scrollBarSprites[0].drawAt(var0, var1); // L: 10326 + GameEngine.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10327 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field628); // L: 10328 + int var5 = var3 * (var3 - 32) / var4; // L: 10329 + if (var5 < 8) { // L: 10330 + var5 = 8; } - } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10331 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field534); // L: 10332 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field506); // L: 10333 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field506); // L: 10334 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field506); // L: 10335 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field506); // L: 10336 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field535); // L: 10337 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field535); // L: 10338 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field535); // L: 10339 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field535); // L: 10340 + } // L: 10341 } diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java index 81bfec44e8..83674ccf3a 100644 --- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java @@ -4,4 +4,5 @@ import net.runelite.mapping.Implements; @Implements("OAuthTokens") public interface OAuthTokens { + void setOAuthTokens(String var1, String var2); } diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java index 4f42fbf3bf..11036b3607 100644 --- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java +++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -538,4 +538,5 @@ public class ScriptOpcodes { public static final int MEC_SPRITE = 6696; public static final int WORLDMAP_ELEMENT = 6697; public static final int WORLDMAP_ELEMENTCOORD = 6699; + } diff --git a/runescape-client/src/main/java/netscape/javascript/JSException.java b/runescape-client/src/main/java/netscape/javascript/JSException.java deleted file mode 100644 index 3a67bd958a..0000000000 --- a/runescape-client/src/main/java/netscape/javascript/JSException.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package netscape.javascript; - -/** - * Thrown when an exception is raised in the JavaScript engine. This is merely - * a marker class to indicate an exception relating to the JavaScript - * interface. - */ -public class JSException extends RuntimeException { - private static final long serialVersionUID = 2778103758223661489L; - - /** - * Constructs a new JavaScript exception with null as it's detail message. - */ - public JSException() { - super(); - } - - /** - * Construct a new JavaScript exception with the specified detail message. - * - * @param s The detail message - */ - public JSException(String s) { - super(s); - } - - /** - * Construct a new JavaScript exception with the specified cause. - * - * @param t Throwable cause - */ - public JSException(Throwable t) { - super(t); - } -} \ No newline at end of file diff --git a/runescape-client/src/main/java/netscape/javascript/JSObject.java b/runescape-client/src/main/java/netscape/javascript/JSObject.java deleted file mode 100644 index 8299df7e75..0000000000 --- a/runescape-client/src/main/java/netscape/javascript/JSObject.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package netscape.javascript; - -import java.applet.Applet; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Iterator; -import java.util.ServiceLoader; - -/** - *

- * Allows Java code to manipulate JavaScript objects. - *

- * - *

- * When a JavaScript object is passed or returned to Java code, it - * is wrapped in an instance of {@code JSObject}. When a - * {@code JSObject} instance is passed to the JavaScript engine, - * it is unwrapped back to its original JavaScript object. The - * {@code JSObject} class provides a way to invoke JavaScript - * methods and examine JavaScript properties. - *

- * - *

Any data returned from the JavaScript engine to Java is - * converted to Java data types. Certain data passed to the JavaScript - * engine is converted to JavaScript data types. - *

- * - */ -@SuppressWarnings("deprecation") -public abstract class JSObject { - /** - * Constructs a new JSObject. Users should neither call this method nor - * subclass JSObject. - */ - protected JSObject() { - } - - /** - * Calls a JavaScript method. Equivalent to - * "this.methodName(args[0], args[1], ...)" in JavaScript. - * - * @param methodName The name of the JavaScript method to be invoked. - * @param args the Java objects passed as arguments to the method. - * @return Result of the method. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract Object call(String methodName, Object... args) throws JSException; - - /** - * Evaluates a JavaScript expression. The expression is a string of - * JavaScript source code which will be evaluated in the context given by - * "this". - * - * @param s The JavaScript expression. - * @return Result of the JavaScript evaluation. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract Object eval(String s) throws JSException; - - /** - * Retrieves a named member of a JavaScript object. Equivalent to - * "this.name" in JavaScript. - * - * @param name The name of the JavaScript property to be accessed. - * @return The value of the propery. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract Object getMember(String name) throws JSException; - - /** - * Sets a named member of a JavaScript object. Equivalent to - * "this.name = value" in JavaScript. - * - * @param name The name of the JavaScript property to be accessed. - * @param value The value of the propery. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract void setMember(String name, Object value) throws JSException; - - /** - * Removes a named member of a JavaScript object. Equivalent - * to "delete this.name" in JavaScript. - * - * @param name The name of the JavaScript property to be removed. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract void removeMember(String name) throws JSException; - - /** - * Retrieves an indexed member of a JavaScript object. Equivalent to - * "this[index]" in JavaScript. - * - * @param index The index of the array to be accessed. - * @return The value of the indexed member. - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract Object getSlot(int index) throws JSException; - - /** - * Sets an indexed member of a JavaScript object. Equivalent to - * "this[index] = value" in JavaScript. - * - * @param index The index of the array to be accessed. - * @param value The value to set - * @throws JSException when an error is reported from the browser or - * JavaScript engine. - */ - public abstract void setSlot(int index, Object value) throws JSException; - - /** - * Returns a JSObject for the window containing the given applet. This - * method only works when the Java code is running in a browser as an - * applet. The object returned may be used to access the HTML DOM directly. - * - * @param applet The applet. - * @return JSObject representing the window containing the given applet or - * {@code null} if we are not connected to a browser. - * @throws JSException when an error is reported from the browser or - * JavaScript engine or if applet is {@code null} - * - * @deprecated The Applet API is deprecated. See the - * - * java.applet package documentation for further information. - */ - - @Deprecated(since = "9") - @SuppressWarnings("exports") - public static JSObject getWindow(Applet applet) throws JSException { - return ProviderLoader.callGetWindow(applet); - } - - private static class ProviderLoader { - private static final JSObjectProvider provider; - - static { - provider = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public JSObjectProvider run() { - Iterator providers = - ServiceLoader.loadInstalled(JSObjectProvider.class).iterator(); - if (providers.hasNext()) { - return providers.next(); - } - return null; - } - } - ); - } - - private static JSObject callGetWindow(Applet applet) { - if (provider != null) { - return provider.getWindow(applet); - } - return null; - } - } -} \ No newline at end of file diff --git a/runescape-client/src/main/java/netscape/javascript/JSObjectProvider.java b/runescape-client/src/main/java/netscape/javascript/JSObjectProvider.java deleted file mode 100644 index 4d69202cfe..0000000000 --- a/runescape-client/src/main/java/netscape/javascript/JSObjectProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -package netscape.javascript; - -import java.applet.Applet; -import netscape.javascript.JSException; -import netscape.javascript.JSObject; - -@SuppressWarnings("deprecation") -public interface JSObjectProvider { - /** - * Return a JSObject for the window containing the given applet. - * Implementations of this class should return null if not connected to a - * browser, for example, when running in AppletViewer. - * - * @param applet The applet. - * @return JSObject for the window containing the given applet or null if we - * are not connected to a browser. - * @throws JSException when an error is encountered. - */ - public JSObject getWindow(Applet applet) throws JSException; -}